fixes

13 files changed, 42 insertions, 43 deletions

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 $@