fixes

32 files changed, 156 insertions, 141 deletions

diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index 40df2a6bd22..45100c12c49 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -6,11 +6,11 @@ C++ compiler
 
 - GCC 3.2; or
 
-- GCC 2.96 with STLport 4.5.3
+- GCC 2.96 with STLport 4.5
 
 The STL (Standard Template Library) that is included with GCC 2.96 is
-not supported! You must use STLport 4.5.3 with GCC 2.96. You can
-download STLport 4.5.3 from:
+not supported! You must use STLport 4.5 with GCC 2.96. You can
+download STLport 4.5 from:
 
 http://www.stlport.org/download.html
 
@@ -30,29 +30,34 @@ running the test scripts, Python is not required.
 Third-party libraries
 ---------------------
 
-- Berkeley DB 3.3.11
-
 - Xerces-C++ 2.1.0
 
+- Berkeley DB 3.3 or 4.0
+
 - OpenSSL 0.9.6
 
 - e2fsprogs 1.27 (only for the UUID library, which is part of this
   package)
 
-- bzip2 1.0.2
+- bzip2 1.0
 
-You can download Berkeley DB 3.3.11 from:
+Xerces-C++ can be download from:
 
-http://www.sleepycat.com/update/index.html.
+http://xml.apache.org/xerces-c
 
-OpenSSL, e2fsprogs, and bzip2 are usually available with your Linux
-distribution. The RPMs for Redhat 8.0 are:
+Berkeley DB, OpenSSL, e2fsprogs, and bzip2 are usually available with
+your Linux distribution. The RPMs for Redhat 8.0 are:
 
+db4-devel-4.0.14-14
 openssl-devel-0.9.6b-29
 e2fsprogs-devel-1.27-9
 bzip2-devel-1.0.2-5
 
-If you don't have them, you can download OpenSSL from:
+If you don't have them, you can download Berkeley DB from :
+
+http://www.sleepycat.com/update/index.html
+
+And OpenSSL from:
 
 http://www.openssl.org
 
@@ -60,6 +65,7 @@ And bzip2 from:
 
 http://sources.redhat.com/bzip2
 
-Sorry, but we are not aware of any download possibility for e2fsprogs
-(or the UUID routines of this package). But to our knowledge, every
-Linux distribution includes this, so there should be no problem.
+Sorry, but we are not aware of any download possibilities for
+e2fsprogs (or the UUID routines included in this package). But to our
+knowledge, every Linux distribution includes this, so there should be
+no problem.
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 6ef2203c4d5..00da929e106 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -25,26 +25,27 @@
 # If you don't want to use STLport, but the compiler's default STL
 # implementation, then define STLPORT_HOME as empty string.
 #
-#STLPORT_HOME	?= /opt/STLport
-DB_HOME		?= /opt/db
-OPENSSL_HOME	?= /opt/openssl
-XERCESC_HOME    ?= /opt/xerces-c
+#STLPORT_HOME		?= /opt/STLport
+#DB_HOME		?= /opt/db
+#OPENSSL_HOME		?= /opt/openssl
+#XERCESC_HOME		?= /opt/xerces-c
 
 #
 # Define OPTIMIZE as yes if you want to build with
 # optimization. Otherwise Ice is build with debug information.
 #
-#OPTIMIZE=yes
+#OPTIMIZE		= yes
 
-#
-# Don't change these lines!
-#
-SHELL		= /bin/sh
-VERSION		= 0.0.1
-bindir		= $(top_srcdir)/bin
-libdir		= $(top_srcdir)/lib
-includedir	= $(top_srcdir)/include
-slicedir	= $(top_srcdir)/slice
+# ----------------------------------------------------------------------
+# Don't change anything below this line!
+# ----------------------------------------------------------------------
+
+SHELL			= /bin/sh
+VERSION			= 0.0.1
+bindir			= $(top_srcdir)/bin
+libdir			= $(top_srcdir)/lib
+includedir		= $(top_srcdir)/include
+slicedir		= $(top_srcdir)/slice
 
 ifneq ($(STLPORT_HOME),)
     STLPORT_FLAGS	= -I$(STLPORT_HOME)/include/stlport
@@ -53,47 +54,63 @@ ifneq ($(STLPORT_HOME),)
     else
         STLPORT_LIBS	= -L$(STLPORT_HOME)/lib -lstlport_gcc_stldebug
     endif
+else
+    STLPORT_FLAGS	=
+    STLPORT_LIBS	=
 endif
 
-XERCESC_FLAGS	= -I$(XERCESC_HOME)/include
-XERCESC_LIBS	= -L$(XERCESC_HOME)/lib -lxerces-c
+ifneq ($(OPENSSL_HOME),)
+    OPENSSL_FLAGS	= -I$(OPENSSL_HOME)/include
+    OPENSSL_LIBS	= -L$(OPENSSL_HOME)/lib -lssl -lcrypto
+else
+    OPENSSL_FLAGS	=
+    OPENSSL_LIBS	= -lssl -lcrypto
+endif
 
-OPENSSL_FLAGS	= -I$(OPENSSL_HOME)/include
-OPENSSL_LIBS	= -L$(OPENSSL_HOME)/lib -lssl -lcrypto
+ifneq ($(DB_HOME),)
+    DB_FLAGS		= -I$(DB_HOME)/include
+    DB_LIBS		= -L$(DB_HOME)/lib -ldb
+else
+    DB_FLAGS		=
+    DB_LIBS		= -ldb
+endif
 
-#
-# Don't change anything below this line!
-#
+ifneq ($(XERCESC_HOME),)
+    XERCESC_FLAGS	= -I$(XERCESC_HOME)/include
+    XERCESC_LIBS	= -L$(XERCESC_HOME)/lib -lxerces-c
+else
+    XERCESC_FLAGS	=
+    XERCESC_LIBS	= -lxerces-c
+endif
 
-CXX		= c++
-CXXFLAGS 	= -ftemplate-depth-128 -fPIC -Wall
+CXX			= c++
+CXXFLAGS 		= -ftemplate-depth-128 -fPIC -Wall
 ifeq ($(OPTIMIZE),yes)
-    CXXFLAGS	:= -O3 -DNDEBUG $(CXXFLAGS)
+    CXXFLAGS		:= -O3 -DNDEBUG $(CXXFLAGS)
 else
-    CXXFLAGS	:= -g $(CXXFLAGS)
+    CXXFLAGS		:= -g $(CXXFLAGS)
 endif
 
-CPPFLAGS	= -I$(includedir) $(STLPORT_FLAGS)
-ICECPPFLAGS	= -I$(slicedir)
+CPPFLAGS		= -I$(includedir) $(STLPORT_FLAGS)
+ICECPPFLAGS		= -I$(slicedir)
 
-LDFLAGS		= -L$(libdir)
-SHLIB_LDFLAGS	= -shared -Xlinker -soname -Xlinker $(@F)
+LDFLAGS			= -L$(libdir)
+SHLIB_LDFLAGS		= -shared -Xlinker -soname -Xlinker $(@F)
 
-LIBEXT		= so
+LIBEXT			= so
 
-BASELIBS	= -lIceUtil -lpthread -luuid $(STLPORT_LIBS)
-LIBS		= -lIce -ldl -lbz2 $(BASELIBS)
-SSLLIBS		= -lIceSSL $(OPENSSL_LIBS)
+BASELIBS		= -lIceUtil -lpthread -luuid $(STLPORT_LIBS)
+LIBS			= -lIce -ldl -lbz2 $(BASELIBS)
 
-SLICE2CPP	= $(bindir)/slice2cpp
-SLICE2XSD	= $(bindir)/slice2xsd
-SLICE2FREEZE	= $(bindir)/slice2freeze
-SLICE2DOCBOOK	= $(bindir)/slice2docbook
+SLICE2CPP		= $(bindir)/slice2cpp
+SLICE2XSD		= $(bindir)/slice2xsd
+SLICE2FREEZE		= $(bindir)/slice2freeze
+SLICE2DOCBOOK		= $(bindir)/slice2docbook
 
-EVERYTHING	= all depend clean
+EVERYTHING		= all depend clean
 
 .SUFFIXES:
-.SUFFIXES:	.cpp .c .o
+.SUFFIXES:		.cpp .c .o
 
 .cpp.o:
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 257ae8c6cb9..9954769b93a 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -32,12 +32,14 @@ compress = 1
 #compress = 0
 
 #
-# Set the host to the host name the test servers are running on. If not
-# set, the local host is used.
+# Set the host to the host name the test servers are running on. If
+# not set, Ice will try to find out the IP address for the
+# hostname. If you DNS isn't set up propertly, you should therefore
+# use "localhost".
 #
 
 #host = "someotherhost"
-host = ""
+host = "localhost"
 
 #
 # Don't change anything below this line!
@@ -70,10 +72,10 @@ else:
 commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.ServerThreadPool.Size=3" + \
                       " --Ice.ConnectionWarnings --Ice.ServerIdleTime=30"
 
-serverOptions = commonServerOptions + serverProtocol
 clientOptions = clientProtocol + defaultHost
-clientServerOptions = commonServerOptions + clientServerProtocol + defaultHost
-collocatedOptions = clientServerProtocol
+serverOptions = serverProtocol + defaultHost + commonServerOptions
+clientServerOptions = clientServerProtocol + defaultHost + commonServerOptions
+collocatedOptions = clientServerProtocol + defaultHost
 
 def isCygwin():
 
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index a10cae3371d..7e3d91c46b9 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -16,7 +16,7 @@ top_srcdir	= ../../..
 
 CLIENT		= client
 
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS		= $(CLIENT)
 
 OBJS		= Client.o BenchTypes.o Test.o
 
@@ -26,12 +26,11 @@ SLICE_SRCS	= Test.ice
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 Test.h Test.cpp: Test.ice $(SLICE2CPP)
 	rm -f Test.h Test.cpp
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index 11f04184611..cf5c7048292 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -51,20 +51,19 @@ SLICE_SRCS	= Library.ice
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze -lIceXML $(LIBS) -ldb -lreadline -lcurses
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) -lreadline -lcurses
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 $(COLLOCATED): $(OBJS) $(COLOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) -ldb -lreadline -lcurses
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -lreadline -lcurses
 
 Grammar.cpp Grammar.h: Grammar.y
 	bison -dvt Grammar.y
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 79b2ec98aea..f0376ab9134 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -51,20 +51,19 @@ SLICE_SRCS	= PhoneBook.ice
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze -lIceXML $(LIBS) -ldb -lreadline -lcurses
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) -lreadline -lcurses
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 $(COLLOCATED): $(OBJS) $(COLOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) -ldb -lreadline -lcurses
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -lreadline -lcurses
 
 Grammar.cpp Grammar.h: Grammar.y
 	bison -dvt Grammar.y
diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index b38d36a4fcd..98f13bd88be 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -37,7 +37,7 @@ SLICECMD	= $(SLICE2CPP) -I$(slicedir)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
diff --git a/cpp/src/Freeze/DBI.h b/cpp/src/Freeze/DBI.h
index c26eae66e5c..1a1d58b06ca 100644
--- a/cpp/src/Freeze/DBI.h
+++ b/cpp/src/Freeze/DBI.h
@@ -20,6 +20,10 @@
 #include <Freeze/DB.h>
 #include <db.h>
 
+#if DB_VERSION_MAJOR < 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR < 3)
+#    error "Berkeley DB versions older than 3.3 are not supported!"
+#endif
+
 namespace Freeze
 {
 
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index ba5d091a072..57d46bdd6c3 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -43,8 +43,7 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir Freeze $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -I$(DB_HOME)/include
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I.. $(DB_FLAGS) $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index 717931d54ed..192b61f9894 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -63,11 +63,11 @@ $(VERSIONED_NAME): $(OBJS)
 
 $(ROUTER): $(ROBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 $(STARTER): $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier $(SSLLIBS) $(LIBS) -lcrypt
+	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) -lcrypt
 
 $(HDIR)/Starter.h Starter.cpp: $(SDIR)/Starter.ice $(SLICE2CPP)
 	rm -f $(HDIR)/Starter.h Starter.cpp
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 0dacc0bdc1a..44531f0c290 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -115,6 +115,11 @@ IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string&
 	_fd = createSocket(false);
 	setBlock(_fd, false);
 	getAddress(host, port, _addr);
+	if(_traceLevels->network >= 2)
+	{
+	    Trace out(_logger, _traceLevels->networkCat);
+	    out << "attempting to bind to tcp socket\n" << toString();
+	}
 	doBind(_fd, _addr);
     }
     catch(...)
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 3f7aa40ff12..f5b1d316687 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -37,7 +37,7 @@ IceInternal::UdpTransceiver::close()
     if(_traceLevels->network >= 1)
     {
 	Trace out(_logger, _traceLevels->networkCat);
-	out << "closing " << _protocolName << " connection\n" << toString();
+	out << "closing udp connection\n" << toString();
     }
 
     assert(_fd != INVALID_SOCKET);
@@ -102,7 +102,7 @@ repeat:
     if(_traceLevels->network >= 3)
     {
 	Trace out(_logger, _traceLevels->networkCat);
-	out << "sent " << ret << " bytes via " << _protocolName << "\n" << toString();
+	out << "sent " << ret << " bytes via udp\n" << toString();
     }
     
     assert(ret == static_cast<int>(buf.b.size()));
@@ -140,7 +140,7 @@ repeat:
 	    if(_traceLevels->network >= 1)
 	    {
 		Trace out(_logger, _traceLevels->networkCat);
-		out << "connected " << _protocolName << " socket\n" << toString();
+		out << "connected udp socket\n" << toString();
 	    }
 	}
     }
@@ -188,7 +188,7 @@ repeat:
     if(_traceLevels->network >= 3)
     {
 	Trace out(_logger, _traceLevels->networkCat);
-	out << "received " << ret << " bytes via " << _protocolName << "\n" << toString();
+	out << "received " << ret << " bytes via udp\n" << toString();
     }
 
     buf.b.resize(ret);
@@ -215,19 +215,11 @@ IceInternal::UdpTransceiver::effectivePort()
     return ntohs(_addr.sin_port);
 }
 
-void
-IceInternal::UdpTransceiver::setProtocolName(const string& protocolName)
-{
-    _protocolName = protocolName;
-}
-
-IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port,
-                                            const string& protocolName) :
+IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port) :
     _traceLevels(instance->traceLevels()),
     _logger(instance->logger()),
     _incoming(false),
-    _connect(true),
-    _protocolName(protocolName)
+    _connect(true)
 {
     try
     {
@@ -240,7 +232,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
 	if(_traceLevels->network >= 1)
 	{
 	    Trace out(_logger, _traceLevels->networkCat);
-	    out << "starting to send " << _protocolName << " packets\n" << toString();
+	    out << "starting to send udp packets\n" << toString();
 	}
     }
     catch(...)
@@ -253,25 +245,28 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     FD_ZERO(&_wFdSet);
 }
 
-IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port,
-					    bool connect, const string& protocolName) :
+IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port, bool connect) :
     _traceLevels(instance->traceLevels()),
     _logger(instance->logger()),
     _incoming(true),
-    _connect(connect),
-    _protocolName(protocolName)
+    _connect(connect)
 {
     try
     {
 	_fd = createSocket(true);
 	setBlock(_fd, false);
 	getAddress(host, port, _addr);
+	if(_traceLevels->network >= 2)
+	{
+	    Trace out(_logger, _traceLevels->networkCat);
+	    out << "attempting to bind to udp socket\n" << toString();
+	}
 	doBind(_fd, _addr);
 	    
 	if(_traceLevels->network >= 1)
 	{
 	    Trace out(_logger, _traceLevels->networkCat);
-	    out << "starting to receive " << _protocolName << " packets\n" << toString();
+	    out << "starting to receive udp packets\n" << toString();
 	}
     }
     catch(...)
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 892ce4a5ff7..66dda73c165 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -44,17 +44,14 @@ public:
 
     bool equivalent(const std::string&, int) const;
     int effectivePort();
-    void setProtocolName(const std::string&);
 
 private:
 
-    UdpTransceiver(const InstancePtr&, const std::string&, int, const std::string& protocolName = "udp");
-    UdpTransceiver(const InstancePtr&, const std::string&, int, bool, const std::string& protocolName = "udp");
+    UdpTransceiver(const InstancePtr&, const std::string&, int);
+    UdpTransceiver(const InstancePtr&, const std::string&, int, bool);
     virtual ~UdpTransceiver();
 
     friend class UdpEndpoint;
-//    friend class SUdpEndpoint; // TODO: Remove as soon as SUdpEndpoint uses SUdpTransceiver.
-//    friend class SUdpTransceiver;
 
     TraceLevelsPtr _traceLevels;
     ::Ice::LoggerPtr _logger;
@@ -64,7 +61,6 @@ private:
     struct sockaddr_in _addr;
     fd_set _rFdSet;
     fd_set _wFdSet;
-    std::string _protocolName;
 };
 
 }
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index be80c5f78c4..1485b20958e 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -43,8 +43,7 @@ SLICECMD	= $(SLICE2CPP) --ice --include-dir IceBox $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS         := $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I.. $(DB_FLAGS) $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
@@ -52,7 +51,7 @@ $(VERSIONED_NAME): $(OBJS)
 
 $(SERVER): $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIceBox -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 $(ADMIN): $(AOBJS)
 	rm -f $@
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 62250285419..8f01b6326c1 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -90,7 +90,6 @@ include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I.. $(CPPFLAGS) $(XERCESC_FLAGS)
 ICECPPFLAGS	:= -I.. $(ICECPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
 
 $(VERSIONED_NAME): $(LIB_OBJS)
 	rm -f $@
@@ -103,12 +102,12 @@ $(ADMIN): $(ADMIN_OBJS)
 $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) \
-	-lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(XERCESC_LIBS) $(LIBS) -ldb
+	-lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(XERCESC_LIBS) $(DB_LIBS)
 
 $(NODE_SERVER): $(NODE_SVR_OBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) \
-	-lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(XERCESC_LIBS) $(LIBS) -ldb
+	-lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(XERCESC_LIBS) $(LIBS) $(DB_LIBS)
 
 Grammar.cpp Grammar.h: Grammar.y
 	bison -dvt Grammar.y
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index 35d5e4435d2..cb693b75c8b 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -54,7 +54,7 @@ $(VERSIONED_NAME): $(OBJS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch -lGlacier $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 $(SERVER): $(SOBJS)
 	rm -f $@
diff --git a/cpp/src/IceSSL/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp
index 0114276058a..ac884763ea5 100644
--- a/cpp/src/IceSSL/SslAcceptor.cpp
+++ b/cpp/src/IceSSL/SslAcceptor.cpp
@@ -115,6 +115,11 @@ IceSSL::SslAcceptor::SslAcceptor(const OpenSSLPluginIPtr& plugin, const string&
 	_fd = createSocket(false);
 	setBlock(_fd, false);
 	getAddress(host, port, _addr);
+	if(_traceLevels->network >= 2)
+	{
+	    Trace out(_logger, _traceLevels->networkCat);
+	    out << "attempting to bind to ssl socket\n" << toString();
+	}
 	doBind(_fd, _addr);
     }
     catch(...)
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 0f54dda4cc7..a9f9061a48e 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -65,9 +65,8 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. -I$(DB_HOME)/include $(XERCESC_FLAGS) $(CPPFLAGS)
+CPPFLAGS	:= -I.. $(XERCESC_FLAGS) $(CPPFLAGS)
 ICECPPFLAGS	:= -I.. $(ICECPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
diff --git a/cpp/src/XMLTransform/Makefile b/cpp/src/XMLTransform/Makefile
index 53df562c3c2..4524109da1d 100644
--- a/cpp/src/XMLTransform/Makefile
+++ b/cpp/src/XMLTransform/Makefile
@@ -35,7 +35,6 @@ SDIR		= $(slicedir)/XMLTransform
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I.. $(CPPFLAGS) $(XERCESC_FLAGS)
-LDFLAGS		:= $(LDFLAGS) $(XERCESC_LIBS) -L$(DB_HOME)/lib
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
@@ -43,7 +42,7 @@ $(VERSIONED_NAME): $(OBJS)
 
 $(TRANSFORM_DB): $(TRANSFORM_OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS)
 
 clean::
 	rm -f $(TRANSFORM_DB)
diff --git a/cpp/src/Yellow/Makefile b/cpp/src/Yellow/Makefile
index 8366f042220..e96b13eb8a9 100644
--- a/cpp/src/Yellow/Makefile
+++ b/cpp/src/Yellow/Makefile
@@ -51,8 +51,7 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir Yellow $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile
index 4198a5f00ec..83adbc98c93 100644
--- a/cpp/test/Freeze/complex/Makefile
+++ b/cpp/test/Freeze/complex/Makefile
@@ -31,12 +31,11 @@ SLICE_SRCS	= Complex.ice
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. -I../../include $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 Grammar.cpp Grammar.h: Grammar.y
 	bison -dvt Grammar.y
diff --git a/cpp/test/Freeze/cursor/Makefile b/cpp/test/Freeze/cursor/Makefile
index 473964e13a3..77c6d530d98 100644
--- a/cpp/test/Freeze/cursor/Makefile
+++ b/cpp/test/Freeze/cursor/Makefile
@@ -24,11 +24,10 @@ SRCS		= $(OBJS:.o=.cpp)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include -I$(DB_HOME)/include $(CPPFLAGS) 
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. -I../../include $(DB_FLAGS) $(CPPFLAGS) 
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 include .depend
diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile
index faaa09b9d9c..4f894d360d8 100644
--- a/cpp/test/Freeze/dbmap/Makefile
+++ b/cpp/test/Freeze/dbmap/Makefile
@@ -26,12 +26,11 @@ SRCS		= $(OBJS:.o=.cpp)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. -I../../include $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 ByteIntMapXML.h ByteIntMapXML.cpp: $(SLICE2FREEZE)
 	rm -f ByteIntMapXML.h ByteIntMapXML.cpp
diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile
index 3af6c126f42..9c00d048743 100644
--- a/cpp/test/Freeze/evictor/Makefile
+++ b/cpp/test/Freeze/evictor/Makefile
@@ -32,8 +32,7 @@ SRCS		= $(OBJS:.o=.cpp) \
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. -I../../include $(DB_FLAGS) $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
@@ -41,7 +40,7 @@ $(CLIENT): $(OBJS) $(COBJS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
 
 Test.h Test.cpp: Test.ice $(SLICE2CPP)
 	rm -f Test.h Test.cpp
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 93732a27adf..9428db098e3 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/Makefile
@@ -38,7 +38,7 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index fd58a5cb4a1..fd6de482fc3 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
@@ -28,6 +28,6 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 include .depend
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index f96c4d5a98c..b843eba3b57 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/Makefile
@@ -37,11 +37,11 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 Pinger.h Pinger.cpp: Pinger.ice $(SLICE2CPP)
 	rm -f Pinger.h Pinger.cpp
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index 636b1788b1f..b98798fbf84 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/Makefile
@@ -28,6 +28,6 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 include .depend
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index 7c487e63b58..8b3b0fe1747 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -28,6 +28,6 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 include .depend
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index 4a3120141bf..b72b8b17246 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/Makefile
@@ -28,6 +28,6 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SSLLIBS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
 
 include .depend
diff --git a/cpp/test/XMLTransform/transform/Makefile b/cpp/test/XMLTransform/transform/Makefile
index 3665a630969..40d97da406e 100644
--- a/cpp/test/XMLTransform/transform/Makefile
+++ b/cpp/test/XMLTransform/transform/Makefile
@@ -63,16 +63,15 @@ SCHEMAS		= TestOld.xsd \
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include $(XERCESC_FLAGS) -I$(DB_HOME)/include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS) $(XERCESC_LIBS) -L$(DB_HOME)/lib
+CPPFLAGS	:= -I. -I../../include $(XERCESC_FLAGS) $(DB_FLAGS) $(CPPFLAGS)
 
 $(POPULATE): $(POPULATE_OBJS) $(SCHEMAS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(POPULATE_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(POPULATE_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS)
 
 $(VALIDATE): $(VALIDATE_OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(VALIDATE_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) -ldb
+	$(CXX) $(LDFLAGS) -o $@ $(VALIDATE_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS)
 
 IntByteMap.h IntByteMap.cpp: $(SLICE2FREEZE)
 	rm -f IntByteMap.h IntByteMap.cpp
diff --git a/cpp/test/Yellow/basicYellow/Makefile b/cpp/test/Yellow/basicYellow/Makefile
index e61d72ec911..46c01b71de3 100644
--- a/cpp/test/Yellow/basicYellow/Makefile
+++ b/cpp/test/Yellow/basicYellow/Makefile
@@ -25,7 +25,6 @@ SRCS		= $(OBJS:.o=.cpp)
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-LDFLAGS		:= $(LDFLAGS)
 
 $(CLIENT): $(OBJS)
 	rm -f $@