diff options
Diffstat (limited to 'cpp/src/Ice/SUdpServerControlChannel.cpp')
| -rw-r--r-- | cpp/src/Ice/SUdpServerControlChannel.cpp | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/cpp/src/Ice/SUdpServerControlChannel.cpp b/cpp/src/Ice/SUdpServerControlChannel.cpp index be2d5415e3b..338ea9bc435 100644 --- a/cpp/src/Ice/SUdpServerControlChannel.cpp +++ b/cpp/src/Ice/SUdpServerControlChannel.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/Security.h> +#include <Ice/OpenSSL.h>
#include <Ice/Buffer.h> #include <Ice/SUdpServerControlChannel.h> #include <Ice/SUdpClient.h> @@ -37,31 +37,19 @@ IceSecurity::SecureUdp::ServerControlChannel::clientHello(const ClientChannelPrx { IceUtil::Mutex::Lock sync(_mutex); - ICE_METHOD_INV("ServerControlChannel::clientHello()"); - Long clientID = getNewClientID(); MessageAuthenticatorPtr messageAuthenticator = new MessageAuthenticator(MACkey); - ICE_DEV_DEBUG("Creating new SUdpClient()"); - SUdpClientPtr sudpClient = new SUdpClient(clientID, client, messageAuthenticator); - ICE_DEV_DEBUG("Creating new CryptKey()"); - assert(_cryptor); CryptKeyPtr cryptKey = _cryptor->getNewKey(); - ICE_DEV_DEBUG("Sending serverHello()"); - sudpClient->serverHello(cryptKey); - ICE_DEV_DEBUG("adding new SUdpClient() to map."); - newSUdpClient(sudpClient); - - ICE_METHOD_RET("ServerControlChannel::clientHello()"); } void @@ -72,15 +60,11 @@ IceSecurity::SecureUdp::ServerControlChannel::clientKeyAcknowledge(Long clientID { IceUtil::Mutex::Lock sync(_mutex); - ICE_METHOD_INV("ServerControlChannel::clientKeyAcknowledge()"); - SUdpClientPtr sudpClient = getSUdpClient(clientID); CryptKeyPtr cryptKey = _cryptor->getKey(key); sudpClient->setNewCryptKey(msgID, cryptKey); - - ICE_METHOD_RET("ServerControlChannel::clientKeyAcknowledge()"); } void @@ -88,15 +72,11 @@ IceSecurity::SecureUdp::ServerControlChannel::clientKeyRequest(Long clientID, co { IceUtil::Mutex::Lock sync(_mutex); - ICE_METHOD_INV("ServerControlChannel::clientKeyRequest()"); - SUdpClientPtr sudpClient = getSUdpClient(clientID); CryptKeyPtr cryptKey = _cryptor->getNewKey(); sudpClient->serverKeyChange(cryptKey); - - ICE_METHOD_RET("ServerControlChannel::clientKeyRequest()"); } void @@ -104,11 +84,7 @@ IceSecurity::SecureUdp::ServerControlChannel::clientGoodbye(Long clientID, const { IceUtil::Mutex::Lock sync(_mutex); - ICE_METHOD_INV("ServerControlChannel::clientGoodbye()"); - deleteSUdpClient(clientID); - - ICE_METHOD_RET("ServerControlChannel::clientGoodbye()"); } // IceSecurity::SecureUdp::ServerControlChannel::ServerControlChannel(const SUdpTransceiverPtr& transceiver, @@ -117,8 +93,6 @@ IceSecurity::SecureUdp::ServerControlChannel::ServerControlChannel(SUdpTransceiv int port) : ControlChannel(transceiver, instance) { - ICE_METHOD_INV("ServerControlChannel::ServerControlChannel()"); - _clientIDGenerator = 0L; // Create the Server Channel's name @@ -135,30 +109,16 @@ IceSecurity::SecureUdp::ServerControlChannel::ServerControlChannel(SUdpTransceiv Ice::CommunicatorPtr communicator = _instance->communicator(); - ICE_DEV_DEBUG("Creating ObjectAdapter."); - // Create our ObjectAdapter _adapter = communicator->createObjectAdapterWithEndpoints(objectAdapterName.str(), endpt.str()); - ICE_DEV_DEBUG("ObjectAdapter created."); - // The server control channel is the implemenation. ServerChannelPtr serverChannel = this; - ICE_DEV_DEBUG("Adding serverChannel to ObjectAdapter."); - _adapter->add(serverChannel, Ice::stringToIdentity(objectName.str())); - ICE_DEV_DEBUG("Added serverChannel named: " + objectName.str()); - - ICE_DEV_DEBUG("Activating ObjectAdapter."); - // Okay, allow the object to begin accepting requests _adapter->activate(); - - ICE_DEV_DEBUG("ObjectAdapter activated."); - - ICE_METHOD_RET("ServerControlChannel::ServerControlChannel()"); } IceSecurity::SecureUdp::ServerControlChannel::~ServerControlChannel() |