22 files changed, 1186 insertions, 37 deletions

diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config
index 79442b68a40..64c6ba6b77b 100644
--- a/cpp/demo/Ice/hello/config
+++ b/cpp/demo/Ice/hello/config
@@ -2,14 +2,14 @@
 # The client reads this property to create the reference to the
 # "hello" object in the server.
 #
-Hello.Hello=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
+Hello.Hello=hello:tcp -p 10000:udp -p 10000:ssl -p 10001:sudp -p 10002
 
 #
 # The server creates one single object adapter with the name
 # "helloadapater". The following line sets the endpoints for this
 # adapter
 #
-Ice.Adapter.HelloAdapter.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.Adapter.HelloAdapter.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001:sudp -p 10002
 
 #
 # Warn about connection exceptions
diff --git a/cpp/slice/Ice/Connection.ice b/cpp/slice/Ice/Connection.ice
index 628463ad0a0..644721bb1f7 100644
--- a/cpp/slice/Ice/Connection.ice
+++ b/cpp/slice/Ice/Connection.ice
@@ -38,8 +38,8 @@ local interface ProtocolInfo
 {
     /**
      *
-     * Get the name of the protocol. For example, "tcp", "udp", or
-     * "ssl".
+     * Get the name of the protocol. For example, "tcp", "udp", "ssl"
+     * or "sudp".
      *
      * @return the name of the protocol.
      *
@@ -79,6 +79,16 @@ local interface SslProtocolInfo extends ProtocolInfo
 
 /**
  *
+ * Specific information about the SUDP protocol.
+ *
+ **/
+local interface SUdpProtocolInfo extends ProtocolInfo
+{
+    // No entry yet
+};
+
+/**
+ *
  * A base interface providing generic information about Internet
  * connections.
  *
diff --git a/cpp/slice/Ice/ConnectionF.ice b/cpp/slice/Ice/ConnectionF.ice
index dd3b488a379..593ab2ba32e 100644
--- a/cpp/slice/Ice/ConnectionF.ice
+++ b/cpp/slice/Ice/ConnectionF.ice
@@ -18,6 +18,7 @@ local interface ProtocolInfo;
 local interface TcpProtocolInfo;
 local interface UdpProtocolInfo;
 local interface SslProtocolInfo;
+local interface SUdpProtocolInfo;
 local interface Connection;
 local interface IncomingConnection;
 local interface OutgoingConnection;
diff --git a/cpp/slice/Ice/SecureUdp.ice b/cpp/slice/Ice/SecureUdp.ice
new file mode 100644
index 00000000000..e6eeda0bf0b
--- /dev/null
+++ b/cpp/slice/Ice/SecureUdp.ice
@@ -0,0 +1,46 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SECURE_UDP_ICE
+#define ICE_SECURE_UDP_ICE
+
+#include <Ice/Stream.ice>
+
+module IceSecurity
+{
+
+module SecureUdp
+{
+
+class ClientChannel
+{
+    void serverHello(long clientID, Ice::ByteSeq key);
+
+    void serverKeyChange(Ice::ByteSeq key);
+
+    void serverGoodbye();
+};
+
+class ServerChannel
+{
+    void clientHello(ClientChannel client, Ice::ByteSeq MACkey);
+
+    void clientKeyAcknowledge(long clientID, long msgID);
+
+    void clientKeyRequest(long clientID);
+
+    void clientGoodbye(long clientID);
+};
+
+};
+
+};
+
+#endif
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 52765b3836c..423c2d8c373 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -12,18 +12,18 @@ BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice
 SysLoggerI.o: SysLoggerI.cpp ../Ice/SysLoggerI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
 TraceLevels.o: TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Properties.h
 TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Protocol.h ../../include/Ice/IdentityUtil.h
-Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../Ice/EndpointF.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/ObjectFactoryManager.h ../../include/Ice/ObjectFactoryF.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/SysLoggerI.h
+Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../Ice/EndpointF.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/ObjectFactoryManager.h ../../include/Ice/ObjectFactoryF.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/SysLoggerI.h
 Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
 CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../Ice/EndpointF.h ../../include/Ice/Logger.h ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
 ObjectFactory.o: ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
 ObjectFactoryManager.o: ObjectFactoryManager.cpp ../Ice/ObjectFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
 ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h
 ObjectAdapterI.o: ObjectAdapterI.cpp ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/EndpointF.h ../../include/Ice/ServantLocator.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/EndpointF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h
+ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/EndpointF.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h
 ServantLocator.o: ServantLocator.cpp ../../include/Ice/ServantLocator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
 UserExceptionFactory.o: UserExceptionFactory.cpp ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
 UserExceptionFactoryManager.o: UserExceptionFactoryManager.cpp ../Ice/UserExceptionFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/UdpTransceiver.h ../../include/Ice/BasicStream.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
+Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/UdpTransceiver.h ../Ice/SUdpTransceiver.h ../Ice/SUdpControlChannel.h ../../include/Ice/BasicStream.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
 Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/IdentityUtil.h
 Identity.o: Identity.cpp ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h
 IdentityUtil.o: IdentityUtil.cpp ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
@@ -33,12 +33,12 @@ ConnectionFactory.o: ConnectionFactory.cpp ../Ice/ConnectionFactory.h ../../incl
 LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h
 Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/Identity.h
 ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
-Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/EndpointF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
+Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/EndpointF.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Connection.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
 Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../Ice/TransceiverF.h ../../include/Ice/ObjectAdapterF.h ../Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../Ice/ProxyFactory.h
 Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
 Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h
 Network.o: Network.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
-ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../Ice/EndpointF.h
+ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../Ice/EndpointF.h ../../include/IceUtil/RecMutex.h
 EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
 Connector.o: Connector.cpp ../Ice/Connector.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h
 Acceptor.o: Acceptor.cpp ../Ice/Acceptor.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/AcceptorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h
@@ -48,20 +48,25 @@ TcpAcceptor.o: TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h ../../
 TcpTransceiver.o: TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/Buffer.h ../Ice/Network.h
 SecurityException.o: SecurityException.cpp ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
 SecurityException2.o: SecurityException2.cpp ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
-SslConnector.o: SslConnector.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslConnector.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/Network.h ../../include/Ice/SecurityException.h
-SslAcceptor.o: SslAcceptor.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/Network.h ../../include/Ice/SecurityException.h
-SslTransceiver.o: SslTransceiver.cpp ../Ice/Security.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../Ice/SslTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/Network.h
+SslConnector.o: SslConnector.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Properties.h ../Ice/SslConnector.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/SecurityException.h
+SslAcceptor.o: SslAcceptor.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Properties.h ../Ice/SslAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/SecurityException.h
+SslTransceiver.o: SslTransceiver.cpp ../Ice/Security.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslTransceiver.h ../../include/Ice/InstanceF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h
 SslBaseCerts.o: SslBaseCerts.cpp ../Ice/SslBaseCerts.h ../Ice/SslCertificateDesc.h
 SslCertificateAuthority.o: SslCertificateAuthority.cpp ../Ice/SslCertificateAuthority.h
 SslCertificateDesc.o: SslCertificateDesc.cpp ../Ice/SslCertificateDesc.h
-SslConfig.o: SslConfig.cpp ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConfigErrorReporter.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/SslConfig.h ../../include/Ice/LoggerF.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
-SslConfigErrorReporter.o: SslConfigErrorReporter.cpp ../Ice/SslConfigErrorReporter.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../Ice/Security.h
-SslConnectionOpenSSLClient.o: SslConnectionOpenSSLClient.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnectionOpenSSLClient.h ../../include/Ice/Buffer.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/SslSystem.h ../../include/Ice/Properties.h
-SslConnectionOpenSSL.o: SslConnectionOpenSSL.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../../include/Ice/Properties.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslGeneralConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
-SslConnectionOpenSSLServer.o: SslConnectionOpenSSLServer.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnectionOpenSSLServer.h ../../include/Ice/Buffer.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/SslSystem.h ../../include/Ice/Properties.h
-SslFactory.o: SslFactory.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslSystemOpenSSL.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslGeneralConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h ../Ice/Security.h
-SslGeneralConfig.o: SslGeneralConfig.cpp ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
-SslSystem.o: SslSystem.cpp ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h
-SslSystemOpenSSL.o: SslSystemOpenSSL.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Security.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../../include/Ice/SecurityException.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConfig.h ../../include/Ice/LoggerF.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
+SslConfig.o: SslConfig.cpp ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConfigErrorReporter.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
+SslConfigErrorReporter.o: SslConfigErrorReporter.cpp ../Ice/SslConfigErrorReporter.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/Security.h
+SslConnectionOpenSSLClient.o: SslConnectionOpenSSLClient.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslSystem.h ../../include/Ice/Properties.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h
+SslConnectionOpenSSL.o: SslConnectionOpenSSL.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../../include/Ice/Properties.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../Ice/SslGeneralConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h
+SslConnectionOpenSSLServer.o: SslConnectionOpenSSLServer.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/Security.h ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslSystem.h ../../include/Ice/Properties.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h
+SslFactory.o: SslFactory.cpp ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Properties.h ../Ice/SslSystemOpenSSL.h ../Ice/SslGeneralConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h ../Ice/Security.h
+SslGeneralConfig.o: SslGeneralConfig.cpp ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
+SslSystem.o: SslSystem.cpp ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Properties.h
+SslSystemOpenSSL.o: SslSystemOpenSSL.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Security.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Properties.h ../../include/Ice/SecurityException.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h
 SslTempCerts.o: SslTempCerts.cpp ../Ice/SslTempCerts.h ../Ice/SslCertificateDesc.h
 UdpTransceiver.o: UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/Buffer.h ../Ice/Network.h
+SUdpTransceiver.o: SUdpTransceiver.cpp ../Ice/SUdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/SUdpControlChannel.h ../Ice/UdpTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/Buffer.h ../Ice/Network.h ../Ice/SUdpClientControlChannel.h ../Ice/SUdpServerControlChannel.h ../../include/Ice/SecureUdp.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Stream.h
+SUdpControlChannel.o: SUdpControlChannel.cpp ../Ice/SUdpControlChannel.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/IceUtil/Shared.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
+SUdpServerControlChannel.o: SUdpServerControlChannel.cpp ../Ice/SUdpServerControlChannel.h ../Ice/SUdpControlChannel.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/IceUtil/Shared.h ../../include/Ice/SecureUdp.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Stream.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Communicator.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/IdentityUtil.h
+SUdpClientControlChannel.o: SUdpClientControlChannel.cpp ../Ice/SUdpClientControlChannel.h ../Ice/SUdpControlChannel.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/IceUtil/Shared.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
+SecureUdp.o: SecureUdp.cpp ../../include/Ice/SecureUdp.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Stream.h
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index 399d7fcfd01..699311c72c3 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -17,6 +17,7 @@
 #include <Ice/SslConnector.h>
 #include <Ice/SslTransceiver.h>
 #include <Ice/UdpTransceiver.h>
+#include <Ice/SUdpTransceiver.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Exception.h>
 #include <Ice/Instance.h>
@@ -67,6 +68,11 @@ IceInternal::Endpoint::endpointFromString(const InstancePtr& instance, const str
 	return new UdpEndpoint(instance, str.substr(end));
     }
 
+    if (protocol == "sudp")
+    {
+	return new SUdpEndpoint(instance, str.substr(end));
+    }
+
     throw EndpointParseException(__FILE__, __LINE__);
 }
 
@@ -96,6 +102,12 @@ IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v)
 	    break;
 	}
 
+	case SUdpEndpointType:
+	{
+	    v = new SUdpEndpoint(s);
+	    break;
+	}
+
 	default:
 	{
 	    v = new UnknownEndpoint(s);
@@ -514,6 +526,11 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
 	    return false; // tcp is not "less than" udp
 	}
 
+	if (dynamic_cast<const SUdpEndpoint*>(&r))
+	{
+	    return false; // tcp is not "less than" sudp
+	}
+
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
 	    return false; // tcp is not "less than" unknown
@@ -816,6 +833,11 @@ IceInternal::SslEndpoint::operator<(const Endpoint& r) const
 	    return false; // ssl is not "less than" udp
 	}
 
+	if (dynamic_cast<const SUdpEndpoint*>(&r))
+	{
+	    return false; // ssl is not "less than" sudp
+	}
+
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
 	    return false; // ssl is not "less than" unknown
@@ -1095,6 +1117,11 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
 	    return true; // udp is "less than" tcp
 	}
 
+	if (dynamic_cast<const SUdpEndpoint*>(&r))
+	{
+	    return false; // udp is not "less than" sudp
+	}
+
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
 	    return false; // udp is not "less than" unknown
@@ -1132,3 +1159,280 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
 
     return false;
 }
+
+///////////////////////////////////////
+
+IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const string& ho, Int po) :
+    _instance(instance),
+    _host(ho),
+    _port(po)
+{
+}
+
+IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const string& str) :
+    _instance(instance),
+    _port(0)
+{
+    const string delim = " \t\n\r";
+
+    string::size_type beg;
+    string::size_type end = 0;
+
+    while (true)
+    {
+	beg = str.find_first_not_of(delim, end);
+	if (beg == string::npos)
+	{
+	    break;
+	}
+	
+	end = str.find_first_of(delim, beg);
+	if (end == string::npos)
+	{
+	    end = str.length();
+	}
+
+	string option = str.substr(beg, end - beg);
+	if (option.length() != 2 || option[0] != '-')
+	{
+	    throw EndpointParseException(__FILE__, __LINE__);
+	}
+
+	beg = str.find_first_not_of(delim, end);
+	if (beg == string::npos)
+	{
+	    throw EndpointParseException(__FILE__, __LINE__);
+	}
+	
+	end = str.find_first_of(delim, beg);
+	if (end == string::npos)
+	{
+	    end = str.length();
+	}
+	
+	string argument = str.substr(beg, end - beg);
+
+	switch (option[1])
+	{
+	    case 'h':
+	    {
+		const_cast<string&>(_host) = argument;
+		break;
+	    }
+
+	    case 'p':
+	    {
+		const_cast<Int&>(_port) = atoi(argument.c_str());
+		break;
+	    }
+
+	    default:
+	    {
+		throw EndpointParseException(__FILE__, __LINE__);
+	    }
+	}
+    }
+
+    if (_host.empty())
+    {
+	const_cast<string&>(_host) = _instance->defaultHost();
+    }
+}
+
+IceInternal::SUdpEndpoint::SUdpEndpoint(BasicStream* s) :
+    _instance(s->instance()),
+    _port(0)
+{
+    s->startReadEncaps();
+    s->read(const_cast<string&>(_host));
+    s->read(const_cast<Int&>(_port));
+    s->endReadEncaps();
+}
+
+void
+IceInternal::SUdpEndpoint::streamWrite(BasicStream* s) const
+{
+    s->write(SUdpEndpointType);
+    s->startWriteEncaps();
+    s->write(_host);
+    s->write(_port);
+    s->endWriteEncaps();
+}
+
+string
+IceInternal::SUdpEndpoint::toString() const
+{
+    ostringstream s;
+    s << "sudp -h " << _host << " -p " << _port;
+    return s.str();
+}
+
+Short
+IceInternal::SUdpEndpoint::type() const
+{
+    return SUdpEndpointType;
+}
+
+Int
+IceInternal::SUdpEndpoint::timeout() const
+{
+    return -1;
+}
+
+EndpointPtr
+IceInternal::SUdpEndpoint::timeout(Int) const
+{
+    return const_cast<SUdpEndpoint*>(this);
+}
+
+bool
+IceInternal::SUdpEndpoint::datagram() const
+{
+    return true;
+}
+
+bool
+IceInternal::SUdpEndpoint::secure() const
+{
+    return true;
+}
+
+TransceiverPtr
+IceInternal::SUdpEndpoint::clientTransceiver() const
+{
+    return new SUdpTransceiver(_instance, _host, _port);
+}
+
+TransceiverPtr
+IceInternal::SUdpEndpoint::serverTransceiver(EndpointPtr& endp) const
+{
+    SUdpTransceiver* p = new SUdpTransceiver(_instance, _port);
+    endp = new SUdpEndpoint(_instance, _host, p->effectivePort());
+    return p;
+}
+
+ConnectorPtr
+IceInternal::SUdpEndpoint::connector() const
+{
+    return 0;
+}
+
+AcceptorPtr
+IceInternal::SUdpEndpoint::acceptor(EndpointPtr& endp) const
+{
+    endp = const_cast<SUdpEndpoint*>(this);
+    return 0;
+}
+
+bool
+IceInternal::SUdpEndpoint::equivalent(const TransceiverPtr& transceiver) const
+{
+    const SUdpTransceiver* sudpTransceiver = dynamic_cast<const SUdpTransceiver*>(transceiver.get());
+    if (!sudpTransceiver)
+    {
+	return false;
+    }
+    return sudpTransceiver->equivalent(_host, _port);
+}
+
+bool
+IceInternal::SUdpEndpoint::equivalent(const AcceptorPtr&) const
+{
+    return false;
+}
+
+bool
+IceInternal::SUdpEndpoint::operator==(const Endpoint& r) const
+{
+    const SUdpEndpoint* p = dynamic_cast<const SUdpEndpoint*>(&r);
+    if (!p)
+    {
+	return false;
+    }
+
+    if (this == p)
+    {
+	return true;
+    }
+
+    if (_port != p->_port)
+    {
+	return false;
+    }
+
+    struct sockaddr_in laddr;
+    struct sockaddr_in raddr;
+    getAddress(_host.c_str(), _port, laddr);
+    getAddress(p->_host.c_str(), p->_port, raddr);
+    if (memcmp(&laddr, &raddr, sizeof(struct sockaddr_in)) != 0)
+    {
+	return false;
+    }
+
+    return true;
+}
+
+bool
+IceInternal::SUdpEndpoint::operator!=(const Endpoint& r) const
+{
+    return !operator==(r);
+}
+
+bool
+IceInternal::SUdpEndpoint::operator<(const Endpoint& r) const
+{
+    const SUdpEndpoint* p = dynamic_cast<const SUdpEndpoint*>(&r);
+    if (!p)
+    {
+	if (dynamic_cast<const SslEndpoint*>(&r))
+	{
+	    return true; // sudp is "less than" ssl
+	}
+
+	if (dynamic_cast<const TcpEndpoint*>(&r))
+	{
+	    return true; // sudp is "less than" tcp
+	}
+
+	if (dynamic_cast<const UdpEndpoint*>(&r))
+	{
+	    return true; // sudp is "less than" udp
+	}
+
+	if (dynamic_cast<const UnknownEndpoint*>(&r))
+	{
+	    return false; // sudp is not "less than" unknown
+	}
+
+	assert(false);
+    }
+
+    if (this == p)
+    {
+	return false;
+    }
+
+    struct sockaddr_in laddr;
+    struct sockaddr_in raddr;
+    getAddress(_host.c_str(), _port, laddr);
+    getAddress(p->_host.c_str(), p->_port, raddr);
+    if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr)
+    {
+	return true;
+    }
+    else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr)
+    {
+	return false;
+    }
+
+    if (_port < p->_port)
+    {
+	return true;
+    }
+    else if (p->_port < _port)
+    {
+	return false;
+    }
+
+    return false;
+}
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 5532e4f2257..9c99f16eca5 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -27,6 +27,7 @@ const ::Ice::Short UnknownEndpointType = 0;
 const ::Ice::Short TcpEndpointType = 1;
 const ::Ice::Short SslEndpointType = 2;
 const ::Ice::Short UdpEndpointType = 3;
+const ::Ice::Short SUdpEndpointType = 4;
 
 class Endpoint : public ::IceUtil::Shared
 {
@@ -268,6 +269,41 @@ private:
     const ::Ice::Int _port;
 };
 
+class SUdpEndpoint : public Endpoint
+{
+public:
+
+    SUdpEndpoint(const InstancePtr&, const std::string&, ::Ice::Int);
+    SUdpEndpoint(const InstancePtr&, const std::string&);
+    SUdpEndpoint(BasicStream*);
+
+    virtual void streamWrite(BasicStream*) const;
+    virtual std::string toString() const;
+    virtual ::Ice::Short type() const;
+    virtual ::Ice::Int timeout() const;
+    virtual EndpointPtr timeout(::Ice::Int) const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+    virtual TransceiverPtr clientTransceiver() const;
+    virtual TransceiverPtr serverTransceiver(EndpointPtr&) const;
+    virtual ConnectorPtr connector() const;
+    virtual AcceptorPtr acceptor(EndpointPtr&) const;
+    virtual bool equivalent(const TransceiverPtr&) const;
+    virtual bool equivalent(const AcceptorPtr&) const;
+
+    virtual bool operator==(const Endpoint&) const;
+    virtual bool operator!=(const Endpoint&) const;
+    virtual bool operator<(const Endpoint&) const;
+
+private:
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const InstancePtr _instance;
+    const std::string _host;
+    const ::Ice::Int _port;
+};
 }
 
 #endif
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 455f2c1a989..20b38c7f845 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -84,7 +84,12 @@ OBJS		= Initialize.o \
                   SslSystem.o \
                   SslSystemOpenSSL.o \
                   SslTempCerts.o \
-		  UdpTransceiver.o
+		  UdpTransceiver.o \
+                  SUdpTransceiver.o \
+                  SUdpControlChannel.o \
+                  SUdpServerControlChannel.o \
+                  SUdpClientControlChannel.o \
+                  SecureUdp.o 
 
 
 SRCS		= $(OBJS:.o=.cpp)
@@ -190,6 +195,14 @@ $(HDIR)/ObjectAdapterF.h: $(SDIR)/ObjectAdapterF.ice $(SLICE2CPP)
 clean::
 	rm -f $(HDIR)/ObjectAdapterF.h
 
+$(HDIR)/SecureUdp.h SecureUdp.cpp: $(SDIR)/SecureUdp.ice $(SLICE2CPP)
+	rm -f $(HDIR)/SecureUdp.h SecureUdp.cpp
+	$(SLICECMD) $(SDIR)/SecureUdp.ice
+	mv SecureUdp.h $(HDIR)
+
+clean::
+	rm -f $(HDIR)/SecureUdp.h SecureUdp.cpp
+
 $(HDIR)/ServantLocator.h ServantLocator.cpp: $(SDIR)/ServantLocator.ice $(SLICE2CPP)
 	rm -f $(HDIR)/ServantLocator.h ServantLocator.cpp
 	$(SLICECMD) $(SDIR)/ServantLocator.ice
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 9863d819011..0d28b15b8e4 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -25,7 +25,7 @@ void IceInternal::decRef(ObjectAdapterFactory* p) { p->__decRef(); }
 void
 IceInternal::ObjectAdapterFactory::shutdown()
 {
-    IceUtil::Mutex::Lock sync(*this);
+    IceUtil::RecMutex::Lock sync(*this);
     for_each(_adapters.begin(), _adapters.end(),
 	     Ice::secondVoidMemFun<string, ObjectAdapter>(&ObjectAdapter::deactivate));
     _adapters.clear();
@@ -34,7 +34,7 @@ IceInternal::ObjectAdapterFactory::shutdown()
 ObjectAdapterPtr
 IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpts)
 {
-    IceUtil::Mutex::Lock sync(*this);
+    IceUtil::RecMutex::Lock sync(*this);
     map<string, ObjectAdapterIPtr>::iterator p = _adapters.find(name);
     if (p != _adapters.end())
     {
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index afbac4a2080..1215c820fca 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -12,11 +12,12 @@
 #define ICE_OBJECT_ADAPTER_FACTORY_H
 
 #include <Ice/ObjectAdapterI.h>
+#include <IceUtil/RecMutex.h>
 
 namespace IceInternal
 {
 
-class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Mutex
+class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::RecMutex
 {
 public:
 
diff --git a/cpp/src/Ice/SUdpClientControlChannel.cpp b/cpp/src/Ice/SUdpClientControlChannel.cpp
new file mode 100644
index 00000000000..869bba92c0e
--- /dev/null
+++ b/cpp/src/Ice/SUdpClientControlChannel.cpp
@@ -0,0 +1,92 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/SUdpClientControlChannel.h>
+#include <Ice/Instance.h>
+#include <Ice/Communicator.h>
+#include <Ice/ObjectAdapter.h>
+#include <Ice/IdentityUtil.h>
+#include <Ice/SUdpTransceiver.h>
+#include <sstream>
+
+using namespace std;
+using namespace Ice;
+using namespace IceSecurity::SecureUdp;
+
+void
+IceSecurity::SecureUdp::ClientControlChannel::serverHello(Long clientID, const ByteSeq& key, const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->serverHello(clientID, key);
+    }
+}
+
+void
+IceSecurity::SecureUdp::ClientControlChannel::serverKeyChange(const ByteSeq& key, const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->serverKeyChange(key);
+    }
+}
+
+void
+IceSecurity::SecureUdp::ClientControlChannel::serverGoodbye(const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->serverGoodbye();
+    }
+}
+
+IceSecurity::SecureUdp::ClientControlChannel::ClientControlChannel(const SUdpTransceiverPtr& transceiver,
+                                                                   const InstancePtr& instance,
+                                                                   const std::string& host,
+                                                                   int port) :
+                                             ControlChannel(transceiver, instance),
+                                             _host(host),
+                                             _port(port)
+{
+    // Create the Client Channel's name
+    ostringstream objectName;
+    objectName << "sudpClient" << hex << (void *) this;
+
+    // This MUST be an SSL endpoint - secure handshake takes place over this.
+    ostringstream endpt;
+    endpt << "ssl";
+
+    // Create the ObjectAdapter's name
+    ostringstream objectAdapterName;
+    objectAdapterName << "sudpClientControl" << hex << (void *) this;
+
+    Ice::CommunicatorPtr communicator = _instance->communicator();
+
+    // Create our ObjectAdapter
+    _adapter = communicator->createObjectAdapterWithEndpoints(objectAdapterName.str(), endpt.str());
+
+    // The client control channel is the implementaion.
+    ClientChannelPtr clientChannel = this;
+
+    _adapter->add(clientChannel, Ice::stringToIdentity(objectName.str()));
+
+    // Okay, allow the object to begin accepting requests
+    _adapter->activate();
+}
+
+IceSecurity::SecureUdp::ClientControlChannel::~ClientControlChannel()
+{
+    // Make it impossible for the control channel to access the Transceiver
+    // after transceiver destruction.
+    unsetTransceiver();
+}
diff --git a/cpp/src/Ice/SUdpClientControlChannel.h b/cpp/src/Ice/SUdpClientControlChannel.h
new file mode 100644
index 00000000000..fcace0b1897
--- /dev/null
+++ b/cpp/src/Ice/SUdpClientControlChannel.h
@@ -0,0 +1,63 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_CLIENT_CONTROL_CHANNEL_H
+#define ICE_SUDP_CLIENT_CONTROL_CHANNEL_H
+
+#include <Ice/SUdpControlChannel.h>
+#include <Ice/SecureUdp.h>
+
+namespace IceInternal
+{
+
+class SUdpTransceiverPtr;
+
+}
+
+namespace IceSecurity
+{
+
+namespace SecureUdp
+{
+
+using IceInternal::SUdpTransceiver;
+using Ice::Long;
+using Ice::ByteSeq;
+using Ice::Current;
+
+class ClientControlChannel : public ControlChannel, public ClientChannel
+{
+
+public:
+
+    virtual void serverHello(Long, const ByteSeq&, const Current&);
+
+    virtual void serverKeyChange(const ByteSeq&, const Current&);
+
+    virtual void serverGoodbye(const Current&);
+
+protected:
+
+    ClientControlChannel(const SUdpTransceiverPtr&, const InstancePtr&, const std::string&, int);
+
+    virtual ~ClientControlChannel();
+
+    friend IceInternal::SUdpTransceiver;
+
+    std::string _host;
+    int _port;
+    Ice::ObjectAdapterPtr _adapter;
+};
+
+}
+
+}
+
+#endif
diff --git a/cpp/src/Ice/SUdpControlChannel.cpp b/cpp/src/Ice/SUdpControlChannel.cpp
new file mode 100644
index 00000000000..127e04908a5
--- /dev/null
+++ b/cpp/src/Ice/SUdpControlChannel.cpp
@@ -0,0 +1,39 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/SUdpControlChannel.h>
+#include <Ice/Instance.h>
+
+using namespace std;
+using namespace Ice;
+
+void IceSecurity::SecureUdp::incRef(ControlChannel* p) { p->__incRef(); }
+void IceSecurity::SecureUdp::decRef(ControlChannel* p) { p->__decRef(); }
+
+IceSecurity::SecureUdp::ControlChannel::ControlChannel(const SUdpTransceiverPtr& transceiver,
+                                                       const InstancePtr& instance) :
+                                       _transceiver(transceiver),
+                                       _instance(instance)
+{
+    assert(transceiver);
+}
+
+IceSecurity::SecureUdp::ControlChannel::~ControlChannel() 
+{
+    unsetTransceiver();
+}
+
+void
+IceSecurity::SecureUdp::ControlChannel::unsetTransceiver()
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    _transceiver = 0;
+}
+
diff --git a/cpp/src/Ice/SUdpControlChannel.h b/cpp/src/Ice/SUdpControlChannel.h
new file mode 100644
index 00000000000..38a42c3b3b1
--- /dev/null
+++ b/cpp/src/Ice/SUdpControlChannel.h
@@ -0,0 +1,51 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_CONTROL_CHANNEL_H
+#define ICE_SUDP_CONTROL_CHANNEL_H
+
+#include <Ice/InstanceF.h>
+#include <IceUtil/Shared.h>
+#include <IceUtil/Mutex.h>
+#include <Ice/SUdpControlChannelF.h>
+#include <Ice/SUdpTransceiverF.h>
+
+namespace IceSecurity
+{
+
+namespace SecureUdp
+{
+
+using IceInternal::SUdpTransceiverPtr;
+using IceInternal::InstancePtr;
+using IceUtil::Shared;
+using IceUtil::Mutex;
+
+class ControlChannel : public virtual Shared
+{
+
+protected:
+    ControlChannel(const SUdpTransceiverPtr&, const InstancePtr&);
+    virtual ~ControlChannel();
+
+    virtual void unsetTransceiver();
+
+    friend IceInternal::SUdpTransceiver;
+
+    SUdpTransceiverPtr _transceiver;
+    InstancePtr _instance;
+    Mutex _mutex;
+};
+
+}
+
+}
+
+#endif
diff --git a/cpp/src/Ice/SUdpControlChannelF.h b/cpp/src/Ice/SUdpControlChannelF.h
new file mode 100644
index 00000000000..30ac312ea3d
--- /dev/null
+++ b/cpp/src/Ice/SUdpControlChannelF.h
@@ -0,0 +1,31 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_CONTROL_CHANNEL_F_H
+#define ICE_SUDP_CONTROL_CHANNEL_F_H
+
+#include <Ice/Handle.h>
+
+namespace IceSecurity
+{
+
+namespace SecureUdp
+{
+
+class ControlChannel;
+void incRef(ControlChannel*);
+void decRef(ControlChannel*);
+typedef IceInternal::Handle<ControlChannel> ControlChannelPtr;
+
+}
+
+}
+
+#endif
diff --git a/cpp/src/Ice/SUdpServerControlChannel.cpp b/cpp/src/Ice/SUdpServerControlChannel.cpp
new file mode 100644
index 00000000000..fde3b25eccc
--- /dev/null
+++ b/cpp/src/Ice/SUdpServerControlChannel.cpp
@@ -0,0 +1,107 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/SUdpServerControlChannel.h>
+#include <Ice/Instance.h>
+#include <Ice/Communicator.h>
+#include <Ice/ObjectAdapter.h>
+#include <Ice/IdentityUtil.h>
+#include <Ice/SUdpTransceiver.h>
+#include <sstream>
+
+using namespace std;
+using namespace Ice;
+using namespace IceSecurity::SecureUdp;
+
+void
+IceSecurity::SecureUdp::ServerControlChannel::clientHello(const ClientChannelPtr& client,
+                                                           const ByteSeq& MACkey,
+                                                           const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->clientHello(client, MACkey);
+    }
+}
+
+void
+IceSecurity::SecureUdp::ServerControlChannel::clientKeyAcknowledge(Long clientID,
+                                                                    Long msgID,
+                                                                    const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->clientKeyAcknowledge(clientID, msgID);
+    }
+}
+
+void
+IceSecurity::SecureUdp::ServerControlChannel::clientKeyRequest(Long clientID,
+                                                                const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->clientKeyRequest(clientID);
+    }
+}
+
+void
+IceSecurity::SecureUdp::ServerControlChannel::clientGoodbye(Long clientID,
+                                                             const Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if (_transceiver != 0)
+    {
+        _transceiver->clientGoodbye(clientID);
+    }
+}
+
+IceSecurity::SecureUdp::ServerControlChannel::ServerControlChannel(const SUdpTransceiverPtr& transceiver,
+                                                                   const InstancePtr& instance,
+                                                                   int port) :
+                                             ControlChannel(transceiver, instance),
+                                             _port(port)
+{
+    // Create the Server Channel's name
+    ostringstream objectName;
+    objectName << "sudpServer" << dec << _port;
+
+    // This MUST be an SSL endpoint - secure handshake take place over this.
+    ostringstream endpt;
+    endpt << "ssl -p " << dec << _port;
+
+    // Create the ObjectAdapter's name
+    ostringstream objectAdapterName;
+    objectAdapterName << "sudpServerControl" << dec << _port;
+
+    Ice::CommunicatorPtr communicator = _instance->communicator();
+
+    // Create our ObjectAdapter
+    _adapter = communicator->createObjectAdapterWithEndpoints(objectAdapterName.str(), endpt.str());
+
+    // The server control channel is the implemenation.
+    ServerChannelPtr serverChannel = this;
+
+    _adapter->add(serverChannel, Ice::stringToIdentity(objectName.str()));
+
+    // Okay, allow the object to begin accepting requests
+    _adapter->activate();
+}
+
+IceSecurity::SecureUdp::ServerControlChannel::~ServerControlChannel()
+{
+    // Make it impossible for the control channel to access the Transceiver
+    // after transceiver destruction.
+    unsetTransceiver();
+}
+
diff --git a/cpp/src/Ice/SUdpServerControlChannel.h b/cpp/src/Ice/SUdpServerControlChannel.h
new file mode 100644
index 00000000000..34991566849
--- /dev/null
+++ b/cpp/src/Ice/SUdpServerControlChannel.h
@@ -0,0 +1,60 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_SERVER_CONTROL_CHANNEL_H
+#define ICE_SUDP_SERVER_CONTROL_CHANNEL_H
+
+#include <Ice/SUdpControlChannel.h>
+#include <Ice/SecureUdp.h>
+
+namespace IceInternal
+{
+
+class SUdpTransceiverPtr;
+
+}
+
+namespace IceSecurity
+{
+
+namespace SecureUdp
+{
+
+using IceInternal::SUdpTransceiver;
+
+class ServerControlChannel : public ControlChannel, public ServerChannel
+{
+
+public:
+    virtual void clientHello(const ClientChannelPtr&, const ::Ice::ByteSeq&, const ::Ice::Current&);
+
+    virtual void clientKeyAcknowledge(::Ice::Long, ::Ice::Long, const ::Ice::Current&);
+
+    virtual void clientKeyRequest(::Ice::Long, const ::Ice::Current&);
+
+    virtual void clientGoodbye(::Ice::Long, const ::Ice::Current&);
+
+protected:
+
+    ServerControlChannel(const SUdpTransceiverPtr&, const InstancePtr&, int);
+
+    virtual ~ServerControlChannel();
+
+    friend IceInternal::SUdpTransceiver;
+
+    int _port;
+    Ice::ObjectAdapterPtr _adapter;
+};
+
+}
+
+}
+
+#endif
diff --git a/cpp/src/Ice/SUdpTransceiver.cpp b/cpp/src/Ice/SUdpTransceiver.cpp
new file mode 100644
index 00000000000..9ca714095b0
--- /dev/null
+++ b/cpp/src/Ice/SUdpTransceiver.cpp
@@ -0,0 +1,161 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/SUdpTransceiver.h>
+#include <Ice/Instance.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+#include <Ice/Buffer.h>
+#include <Ice/Network.h>
+#include <Ice/Exception.h>
+#include <Ice/SUdpClientControlChannel.h>
+#include <Ice/SUdpServerControlChannel.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+using namespace IceSecurity::SecureUdp;
+
+void IceInternal::incRef(SUdpTransceiver* p) { p->__incRef(); }
+void IceInternal::decRef(SUdpTransceiver* p) { p->__decRef(); }
+
+SOCKET
+IceInternal::SUdpTransceiver::fd()
+{
+    return _udpTransceiver.fd();
+}
+
+void
+IceInternal::SUdpTransceiver::close()
+{
+    _udpTransceiver.close();
+}
+
+void
+IceInternal::SUdpTransceiver::shutdown()
+{
+    _udpTransceiver.shutdown();
+}
+
+void
+IceInternal::SUdpTransceiver::write(Buffer& buf, int)
+{
+    _udpTransceiver.write(buf,0);
+}
+
+void
+IceInternal::SUdpTransceiver::read(Buffer& buf, int)
+{
+    _udpTransceiver.read(buf,0);
+}
+
+string
+IceInternal::SUdpTransceiver::toString() const
+{
+    return _udpTransceiver.toString();
+}
+
+bool
+IceInternal::SUdpTransceiver::equivalent(const string& host, int port) const
+{
+    return _udpTransceiver.equivalent(host, port);
+}
+
+int
+IceInternal::SUdpTransceiver::effectivePort()
+{
+    return _udpTransceiver.effectivePort();
+}
+
+void
+IceInternal::SUdpTransceiver::clientHello(const ClientChannelPtr& client, const ByteSeq& MACkey)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::clientKeyAcknowledge(Long clientID, Long msgID)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::clientKeyRequest(Long clientID)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::clientGoodbye(Long clientID)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::serverHello(Long clientID, const ByteSeq& key)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::serverKeyChange(const ByteSeq& key)
+{
+}
+
+void
+IceInternal::SUdpTransceiver::serverGoodbye()
+{
+}
+
+IceInternal::SUdpTransceiver::SUdpTransceiver(const InstancePtr& instance, const string& host, int port) :
+    _udpTransceiver(instance, host, port, "sudp"),
+    _instance(instance),
+    _traceLevels(instance->traceLevels()),
+    _logger(instance->logger()),
+    _sender(true)
+{
+    // Perform our handshake with the server
+    connectControlChannel(host, port);
+}
+
+IceInternal::SUdpTransceiver::SUdpTransceiver(const InstancePtr& instance, int port) :
+    _udpTransceiver(instance, port, "sudp"),
+    _instance(instance),
+    _traceLevels(instance->traceLevels()),
+    _logger(instance->logger()),
+    _sender(false)
+{
+    // Build our control channel
+    createControlChannel(port);
+
+    // Activate the control channel (begin taking connections)
+    activateControlChannel();
+}
+
+IceInternal::SUdpTransceiver::~SUdpTransceiver()
+{
+    // delete _controlChannel;
+    _controlChannel->unsetTransceiver();
+}
+
+void
+IceInternal::SUdpTransceiver::connectControlChannel(const std::string& host, int port)
+{
+    // Create a control channel, one for this Client SUdp connection
+    _controlChannel = new ClientControlChannel(this, _instance, host, port);
+}
+
+void
+IceInternal::SUdpTransceiver::createControlChannel(int port)
+{
+    // Create a control channel, one for this Server SUdp connection
+    _controlChannel = new ServerControlChannel(this, _instance, port);
+}
+
+void
+IceInternal::SUdpTransceiver::activateControlChannel()
+{
+}
+
diff --git a/cpp/src/Ice/SUdpTransceiver.h b/cpp/src/Ice/SUdpTransceiver.h
new file mode 100644
index 00000000000..1193125f7cb
--- /dev/null
+++ b/cpp/src/Ice/SUdpTransceiver.h
@@ -0,0 +1,85 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_TRANSCEIVER_H
+#define ICE_SUDP_TRANSCEIVER_H
+
+#include <Ice/InstanceF.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
+#include <Ice/SUdpControlChannelF.h>
+#include <Ice/SecureUdp.h>
+#include <Ice/UdpTransceiver.h>
+#include <Ice/SUdpTransceiverF.h>
+
+#ifndef WIN32
+#   include <netinet/in.h> // For struct sockaddr_in
+#endif
+
+namespace IceInternal
+{
+
+using Ice::ByteSeq;
+using Ice::Long;
+using IceSecurity::SecureUdp::ClientChannelPtr;
+using IceSecurity::SecureUdp::ControlChannelPtr;
+
+class SUdpEndpoint;
+
+class SUdpTransceiver : public Transceiver
+{
+public:
+
+    virtual SOCKET fd();
+    virtual void close();
+    virtual void shutdown();
+    virtual void write(Buffer&, int);
+    virtual void read(Buffer&, int);
+    virtual std::string toString() const;
+
+    virtual bool equivalent(const std::string&, int) const;
+    
+    int effectivePort();
+
+    // Server Channel Implementation methods
+    void clientHello(const ClientChannelPtr&, const ByteSeq&);
+    void clientKeyAcknowledge(Long, Long);
+    void clientKeyRequest(Long);
+    void clientGoodbye(Long);
+
+    // Client Channel Implementation methods
+    void serverHello(Long, const ByteSeq&);
+    void serverKeyChange(const ByteSeq&);
+    void serverGoodbye();
+
+private:
+
+    SUdpTransceiver(const InstancePtr&, const std::string&, int);
+    SUdpTransceiver(const InstancePtr&, int);
+    virtual ~SUdpTransceiver();
+
+    friend class SUdpEndpoint;
+
+    void connectControlChannel(const std::string&, int);
+    void createControlChannel(int);
+    void activateControlChannel();
+
+    UdpTransceiver _udpTransceiver;
+    ControlChannelPtr _controlChannel;
+
+    InstancePtr _instance;
+    TraceLevelsPtr _traceLevels;
+    ::Ice::LoggerPtr _logger;
+    bool _sender;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/SUdpTransceiverF.h b/cpp/src/Ice/SUdpTransceiverF.h
new file mode 100644
index 00000000000..f46bd48b8a8
--- /dev/null
+++ b/cpp/src/Ice/SUdpTransceiverF.h
@@ -0,0 +1,26 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SUDP_TRANSCEIVER_F_H
+#define ICE_SUDP_TRANSCEIVER_F_H
+
+#include <Ice/Handle.h>
+
+namespace IceInternal
+{
+
+class SUdpTransceiver;
+void incRef(SUdpTransceiver*);
+void decRef(SUdpTransceiver*);
+typedef IceInternal::Handle<SUdpTransceiver> SUdpTransceiverPtr;
+
+}
+
+#endif
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 8726052312b..5144419160e 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -34,11 +34,11 @@ IceInternal::UdpTransceiver::close()
 	ostringstream s;
 	if (_sender)
 	{
-	    s << "stopping to send udp packets to " << toString();
+	    s << "stopping to send " << _protocolName << " packets to " << toString();
 	}
 	else
 	{
-	    s << "stopping to receive udp packets at " << toString();
+	    s << "stopping to receive " << _protocolName << " packets at " << toString();
 	}
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
@@ -81,7 +81,7 @@ repeat:
     if (_traceLevels->network >= 3)
     {
 	ostringstream s;
-	s << "sent " << ret << " bytes via udp to " << toString();
+	s << "sent " << ret << " bytes via " << _protocolName << " to " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
     
@@ -117,7 +117,7 @@ repeat:
     if (_traceLevels->network >= 3)
     {
 	ostringstream s;
-	s << "received " << ret << " bytes via udp at " << toString();
+	s << "received " << ret << " bytes via " << _protocolName << " at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 
@@ -157,11 +157,21 @@ IceInternal::UdpTransceiver::effectivePort()
     return ntohs(_addr.sin_port);
 }
 
-IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port) :
+void
+IceInternal::UdpTransceiver::setProtocolName(const string& protocolName)
+{
+    _protocolName = protocolName;
+}
+
+IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance,
+                                            const string& host,
+                                            int port,
+                                            const string& protocolName) :
     _instance(instance),
     _traceLevels(instance->traceLevels()),
     _logger(instance->logger()),
-    _sender(true)
+    _sender(true),
+    _protocolName(protocolName)
 {
     try
     {
@@ -173,7 +183,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
 	if (_traceLevels->network >= 1)
 	{
 	    ostringstream s;
-	    s << "starting to send udp packets to " << toString();
+	    s << "starting to send " << _protocolName << " packets to " << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
     }
@@ -184,11 +194,12 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     }
 }
 
-IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, int port) :
+IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, int port, const string& protocolName) :
     _instance(instance),
     _traceLevels(instance->traceLevels()),
     _logger(instance->logger()),
-    _sender(false)
+    _sender(false),
+    _protocolName(protocolName)
 {
     try
     {
@@ -203,7 +214,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, int por
 	if (_traceLevels->network >= 1)
 	{
 	    ostringstream s;
-	    s << "starting to receive udp packets at " << toString();
+	    s << "starting to receive " << _protocolName << " packets at " << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
     }
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 98d0e01b561..4425ca95b29 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -25,6 +25,8 @@ namespace IceInternal
 
 class UdpEndpoint;
 
+class SUdpTransceiver;
+
 class UdpTransceiver : public Transceiver
 {
 public:
@@ -40,12 +42,16 @@ public:
     
     int effectivePort();
 
+    void setProtocolName(const std::string&);
+
 private:
 
-    UdpTransceiver(const InstancePtr&, const std::string&, int);
-    UdpTransceiver(const InstancePtr&, int);
+    UdpTransceiver(const InstancePtr&, const std::string&, int, const std::string& protocolName = "udp");
+    UdpTransceiver(const InstancePtr&, int, const std::string& protocolName = "udp");
     virtual ~UdpTransceiver();
+
     friend class UdpEndpoint;
+    friend class SUdpTransceiver;
 
     InstancePtr _instance;
     TraceLevelsPtr _traceLevels;
@@ -53,6 +59,7 @@ private:
     bool _sender;
     SOCKET _fd;
     struct sockaddr_in _addr;
+    std::string _protocolName;
 };
 
 }