diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-03-19 15:39:33 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-03-19 15:39:33 +0000 |
| commit | c210b6ff1ef66fd972c40bcc07db28231099e7b4 (patch) | |
| tree | f274afcfff721976a71b3389f373ab759c8e5fa3 /cpp/src | |
| parent | Updated the properties added to the SSL extension, and those added for (diff) | |
| download | ice-c210b6ff1ef66fd972c40bcc07db28231099e7b4.tar.bz2 ice-c210b6ff1ef66fd972c40bcc07db28231099e7b4.tar.xz ice-c210b6ff1ef66fd972c40bcc07db28231099e7b4.zip | |
Removed the SUDP implementation (for now). See the tag sudp in CVS to
recover.
Diffstat (limited to 'cpp/src')
26 files changed, 308 insertions, 2067 deletions
diff --git a/cpp/src/Ice/CryptKey.cpp b/cpp/src/Ice/CryptKey.cpp deleted file mode 100644 index e9cf4c5ddfa..00000000000 --- a/cpp/src/Ice/CryptKey.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/CryptKey.h> - -using Ice::ByteSeq; - -void ::IceInternal::incRef(::SecureUdp::CryptKey* p) { p->__incRef(); } -void ::IceInternal::decRef(::SecureUdp::CryptKey* p) { p->__decRef(); } - -SecureUdp::CryptKey::CryptKey(const ByteSeq& key) : - _keyBytes(key) -{ -} - -SecureUdp::CryptKey::~CryptKey() -{ -} - -const ByteSeq& -SecureUdp::CryptKey::toByteSeq() const -{ - return _keyBytes; -} - -bool -SecureUdp::CryptKey::operator == (const CryptKey& key) const -{ - return _keyBytes == key._keyBytes; -} - -bool -SecureUdp::CryptKey::operator != (const CryptKey& key) const -{ - return !operator==(key); -} - -bool -SecureUdp::CryptKey::operator < (const CryptKey& key) const -{ - return _keyBytes < key._keyBytes; -} - diff --git a/cpp/src/Ice/CryptKey.h b/cpp/src/Ice/CryptKey.h deleted file mode 100644 index 4da7851e636..00000000000 --- a/cpp/src/Ice/CryptKey.h +++ /dev/null @@ -1,55 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_CRYPT_KEY_H -#define ICE_CRYPT_KEY_H - -#include <IceUtil/Shared.h> -#include <Ice/Stream.h> -#include <Ice/CryptKeyF.h> - -namespace SecureUdp -{ - -class CryptKey : public IceUtil::Shared -{ - -public: - CryptKey(const Ice::ByteSeq&); - virtual ~CryptKey(); - - virtual const Ice::ByteSeq& toByteSeq() const; - - // - // Compare CryptKeys for sorting purposes - // - virtual bool operator==(const CryptKey&) const; - virtual bool operator!=(const CryptKey&) const; - virtual bool operator<(const CryptKey&) const; - -protected: - Ice::ByteSeq _keyBytes; - -}; - -inline bool operator==(const CryptKey& cryptKey, const CryptKeyPtr& cryptKeyPtr) -{ - return (cryptKey == *(cryptKeyPtr.get())); -} - -inline bool operator==(const CryptKeyPtr& cryptKeyPtr, const CryptKey& cryptKey) -{ - return (cryptKey == *(cryptKeyPtr.get())); -} - -} - -#endif - diff --git a/cpp/src/Ice/CryptKeyF.h b/cpp/src/Ice/CryptKeyF.h deleted file mode 100644 index 04060533a13..00000000000 --- a/cpp/src/Ice/CryptKeyF.h +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_CRYPT_KEY_F_H -#define ICE_CRYPT_KEY_F_H - -#include <Ice/Handle.h> - -namespace SecureUdp -{ - -class CryptKey; -typedef IceInternal::Handle<CryptKey> CryptKeyPtr; - -} - -namespace IceInternal -{ - -void incRef(::SecureUdp::CryptKey*); -void decRef(::SecureUdp::CryptKey*); - -} - -#endif - diff --git a/cpp/src/Ice/Cryptor.cpp b/cpp/src/Ice/Cryptor.cpp deleted file mode 100644 index 563b315de5e..00000000000 --- a/cpp/src/Ice/Cryptor.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/Cryptor.h> -#include <Ice/CryptKey.h> -#include <algorithm> - -void ::IceInternal::incRef(::SecureUdp::Cryptor* p) { p->__incRef(); } -void ::IceInternal::decRef(::SecureUdp::Cryptor* p) { p->__decRef(); } - -using Ice::ByteSeq; -using SecureUdp::CryptKey; -using SecureUdp::CryptKeyPtr; - -SecureUdp::Cryptor::Cryptor() -{ -} - -SecureUdp::Cryptor::~Cryptor() -{ -} - -const CryptKeyPtr -SecureUdp::Cryptor::getNewKey() -{ - // Gotta return a newly generated key here. - ByteSeq byteSeq; - - // Bogus key - gotta fix this. - byteSeq.push_back('A'); - byteSeq.push_back('n'); - byteSeq.push_back('t'); - byteSeq.push_back('h'); - byteSeq.push_back('o'); - byteSeq.push_back('n'); - byteSeq.push_back('y'); - byteSeq.push_back('D'); - byteSeq.push_back('a'); - byteSeq.push_back('r'); - byteSeq.push_back('i'); - byteSeq.push_back('u'); - byteSeq.push_back('s'); - - CryptKeyPtr cryptKey = new CryptKey(byteSeq); - - _cryptKeys.push_back(cryptKey); - - return cryptKey; -} - -const CryptKeyPtr -SecureUdp::Cryptor::getKey(const ByteSeq& key) -{ - CryptKeyPtr cryptKey = new CryptKey(key); - - CryptKeys::iterator begin = _cryptKeys.begin(); - CryptKeys::iterator end = _cryptKeys.end(); - CryptKeys::iterator pos = std::find(begin, end, cryptKey); - - if (pos == end) - { - // TODO: Exception - Trying to use a key that we didn't hand out. - } - - return *pos; -} - -const CryptKeyPtr -SecureUdp::Cryptor::getOrCreateKey(const ByteSeq& key) -{ - CryptKeyPtr cryptKey; - - cryptKey = getKey(key); - - if (cryptKey == 0) - { - cryptKey = new CryptKey(key); - - _cryptKeys.push_back(cryptKey); - } - - return cryptKey; -} - -void -SecureUdp::Cryptor::encrypt(const CryptKeyPtr& key, const ByteSeq& plainBuffer, ByteSeq& encryptedBuffer) -{ - encryptedBuffer = plainBuffer; -} - -void -SecureUdp::Cryptor::decrypt(const CryptKeyPtr& key, const ByteSeq& encryptedBuffer, ByteSeq& plainBuffer) -{ - plainBuffer = encryptedBuffer; -} diff --git a/cpp/src/Ice/Cryptor.h b/cpp/src/Ice/Cryptor.h deleted file mode 100644 index 9794baddff1..00000000000 --- a/cpp/src/Ice/Cryptor.h +++ /dev/null @@ -1,50 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_CRYPTOR_H -#define ICE_CRYPTOR_H - -#include <IceUtil/Shared.h> -#include <Ice/Stream.h> -#include <Ice/CryptKeyF.h> -#include <Ice/CryptorF.h> -#include <vector> - -namespace SecureUdp -{ - -typedef std::vector<CryptKeyPtr> CryptKeys; - -class Cryptor : public IceUtil::Shared -{ - -public: - Cryptor(); - virtual ~Cryptor(); - - virtual const CryptKeyPtr getNewKey(); - - virtual const CryptKeyPtr getKey(const Ice::ByteSeq&); - - virtual const CryptKeyPtr getOrCreateKey(const Ice::ByteSeq&); - - virtual void encrypt(const CryptKeyPtr&, const Ice::ByteSeq&, Ice::ByteSeq&); - - virtual void decrypt(const CryptKeyPtr&, const Ice::ByteSeq&, Ice::ByteSeq&); - -protected: - CryptKeys _cryptKeys; - -}; - -} - -#endif - diff --git a/cpp/src/Ice/CryptorF.h b/cpp/src/Ice/CryptorF.h deleted file mode 100644 index f9ce75b3bc2..00000000000 --- a/cpp/src/Ice/CryptorF.h +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_CRYPTOR_F_H -#define ICE_CRYPTOR_F_H - -#include <Ice/Handle.h> - -namespace SecureUdp -{ - -class Cryptor; -typedef IceInternal::Handle<Cryptor> CryptorPtr; - -} - -namespace IceInternal -{ - -void incRef(::SecureUdp::Cryptor*); -void decRef(::SecureUdp::Cryptor*); - -} - -#endif - diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp index 71c6b6b94fc..d282f8b749a 100644 --- a/cpp/src/Ice/Endpoint.cpp +++ b/cpp/src/Ice/Endpoint.cpp @@ -17,7 +17,7 @@ #include <Ice/SslConnector.h> #include <Ice/SslTransceiver.h> #include <Ice/UdpTransceiver.h> -#include <Ice/SUdpTransceiver.h> +// #include <Ice/SUdpTransceiver.h> #include <Ice/BasicStream.h> #include <Ice/Exception.h> #include <Ice/Instance.h> @@ -67,11 +67,13 @@ 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__); } @@ -101,12 +103,14 @@ IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v) v = new UdpEndpoint(s); break; } - +
+/* case SUdpEndpointType: { v = new SUdpEndpoint(s); break; - } + }
+*/ default: { @@ -564,11 +568,13 @@ 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)) { @@ -904,11 +910,13 @@ 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)) { @@ -1239,11 +1247,13 @@ 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)) { @@ -1297,7 +1307,8 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const return false; } - +
+/* IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const string& ho, Int po) : _instance(instance), _host(ho), @@ -1631,4 +1642,5 @@ IceInternal::SUdpEndpoint::operator<(const Endpoint& r) const } return false; -} +}
+*/ diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h index aa16c080b0f..49a1a7807bf 100644 --- a/cpp/src/Ice/Endpoint.h +++ b/cpp/src/Ice/Endpoint.h @@ -27,7 +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; +// const ::Ice::Short SUdpEndpointType = 4; class Endpoint : public ::IceUtil::Shared { @@ -279,7 +279,8 @@ private: const ::Ice::Int _port; const bool _connect; }; - +
+/* class SUdpEndpoint : public Endpoint { public: @@ -316,7 +317,8 @@ private: const std::string _host; const ::Ice::Int _port; const bool _connect; -}; +};
+*/ } diff --git a/cpp/src/Ice/MessageAuthenticator.cpp b/cpp/src/Ice/MessageAuthenticator.cpp deleted file mode 100644 index 42207fbdcfa..00000000000 --- a/cpp/src/Ice/MessageAuthenticator.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/MessageAuthenticator.h> - -using Ice::ByteSeq; - -void ::IceInternal::incRef(::SecureUdp::MessageAuthenticator* p) { p->__incRef(); } -void ::IceInternal::decRef(::SecureUdp::MessageAuthenticator* p) { p->__decRef(); } - -SecureUdp::MessageAuthenticator::MessageAuthenticator() -{ - // TODO: Should generate a random MAC key here - - // Bogus MAC - gotta fix this. - _macKeyBytes.push_back(2); - _macKeyBytes.push_back(0); - _macKeyBytes.push_back(0); - _macKeyBytes.push_back(2); - _macKeyBytes.push_back(0); - _macKeyBytes.push_back(1); - _macKeyBytes.push_back(1); - _macKeyBytes.push_back(7); - _macKeyBytes.push_back(1); - _macKeyBytes.push_back(0); - _macKeyBytes.push_back(2); - _macKeyBytes.push_back(2); -} - -SecureUdp::MessageAuthenticator::MessageAuthenticator(const ByteSeq& macKey) -{ - _macKeyBytes = macKey; -} - -SecureUdp::MessageAuthenticator::~MessageAuthenticator() -{ -} - -ByteSeq -SecureUdp::MessageAuthenticator::computeMAC(const ByteSeq& message) const -{ - // TODO: Should generate a REAL MAC here. - ByteSeq bytes; - - // Bogus MAC - gotta fix this. - bytes.push_back(2); - bytes.push_back(0); - bytes.push_back(0); - bytes.push_back(2); - bytes.push_back(0); - bytes.push_back(1); - bytes.push_back(1); - bytes.push_back(7); - bytes.push_back(1); - bytes.push_back(0); - bytes.push_back(2); - bytes.push_back(2); - - return bytes; -} - -bool -SecureUdp::MessageAuthenticator::authenticate(const ByteSeq& message, const ByteSeq& macCode) -{ - ByteSeq targetMAC = computeMAC(message); - return targetMAC == macCode; -} - -const ByteSeq& -SecureUdp::MessageAuthenticator::getMACKey() const -{ - return _macKeyBytes; -} - diff --git a/cpp/src/Ice/MessageAuthenticator.h b/cpp/src/Ice/MessageAuthenticator.h deleted file mode 100644 index a829cc4e27b..00000000000 --- a/cpp/src/Ice/MessageAuthenticator.h +++ /dev/null @@ -1,43 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_MESSAGE_AUTHENTICATOR_H -#define ICE_MESSAGE_AUTHENTICATOR_H - -#include <IceUtil/Shared.h> -#include <Ice/Stream.h> -#include <Ice/MessageAuthenticatorF.h> - -namespace SecureUdp -{ - -class MessageAuthenticator : public IceUtil::Shared -{ - -public: - MessageAuthenticator(); - MessageAuthenticator(const Ice::ByteSeq&); - virtual ~MessageAuthenticator(); - - virtual Ice::ByteSeq computeMAC(const Ice::ByteSeq&) const; - - virtual bool authenticate(const Ice::ByteSeq&, const Ice::ByteSeq&); - - virtual const Ice::ByteSeq& getMACKey() const; - -protected: - Ice::ByteSeq _macKeyBytes; - -}; - -} - -#endif - diff --git a/cpp/src/Ice/MessageAuthenticatorF.h b/cpp/src/Ice/MessageAuthenticatorF.h deleted file mode 100644 index 7d0cd83f2b6..00000000000 --- a/cpp/src/Ice/MessageAuthenticatorF.h +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_MESSAGE_AUTHENTICATOR_F_H -#define ICE_MESSAGE_AUTHENTICATOR_F_H - -#include <Ice/Handle.h> - -namespace SecureUdp -{ - -class MessageAuthenticator; -typedef IceInternal::Handle<MessageAuthenticator> MessageAuthenticatorPtr; - -} - -namespace IceInternal -{ - -void incRef(::SecureUdp::MessageAuthenticator*); -void decRef(::SecureUdp::MessageAuthenticator*); - -} - -#endif - diff --git a/cpp/src/Ice/SUdpClient.cpp b/cpp/src/Ice/SUdpClient.cpp deleted file mode 100644 index 1540a95ec75..00000000000 --- a/cpp/src/Ice/SUdpClient.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/SUdpClient.h> -#include <Ice/CryptKey.h> -#include <Ice/MessageAuthenticator.h> -#include <Ice/SecureUdp.h> - -using Ice::Long; -using SecureUdp::CryptKeyPtr; -using SecureUdp::MessageAuthenticatorPtr; - -void ::IceInternal::incRef(::SecureUdp::SUdpClient* p) { p->__incRef(); } -void ::IceInternal::decRef(::SecureUdp::SUdpClient* p) { p->__decRef(); } - -SecureUdp::SUdpClient::SUdpClient(Long clientID, - const ClientChannelPrx& clientChannel, - const MessageAuthenticatorPtr& messageAuthenticator) : - _clientID(clientID), - _clientChannel(clientChannel), - _messageAuthenticator(messageAuthenticator) -{ - assert(_clientChannel); - assert(_messageAuthenticator); -} - -SecureUdp::SUdpClient::~SUdpClient() -{ -} - -void -SecureUdp::SUdpClient::serverHello(const CryptKeyPtr& key) -{ - assert(_clientChannel); - _clientChannel->serverHello(_clientID, key->toByteSeq()); -} - -void -SecureUdp::SUdpClient::serverKeyChange(const CryptKeyPtr& key) -{ - assert(_clientChannel); - _clientChannel->serverKeyChange(key->toByteSeq()); -} - -void -SecureUdp::SUdpClient::serverGoodbye() -{ - assert(_clientChannel); - _clientChannel->serverGoodbye(); -} - -Long -SecureUdp::SUdpClient::getClientID() const -{ - return _clientID; -} - -const CryptKeyPtr& -SecureUdp::SUdpClient::getCryptKey() const -{ - return _cryptKey; -} - -const CryptKeyPtr& -SecureUdp::SUdpClient::getCryptKey(Long msgID) const -{ - // TODO: Must be able to return a CryptKey based on a msgID - return _cryptKey; -} - -const MessageAuthenticatorPtr& -SecureUdp::SUdpClient::getMessageAuthenticator() const -{ - return _messageAuthenticator; -} - -void -SecureUdp::SUdpClient::setNewCryptKey(Long msgID, const CryptKeyPtr& cryptKey) -{ - _cryptKey = cryptKey; -} - diff --git a/cpp/src/Ice/SUdpClient.h b/cpp/src/Ice/SUdpClient.h deleted file mode 100644 index d64cb5c446d..00000000000 --- a/cpp/src/Ice/SUdpClient.h +++ /dev/null @@ -1,58 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SUDP_CLIENT_H -#define ICE_SUDP_CLIENT_H - -#include <Ice/SecureUdpF.h> -#include <Ice/Stream.h> -#include <IceUtil/Shared.h> -#include <Ice/SUdpClientF.h> -#include <Ice/MessageAuthenticatorF.h> -#include <Ice/CryptKeyF.h> - -namespace SecureUdp -{ - -class SUdpClient : public IceUtil::Shared -{ - -public: - SUdpClient(Ice::Long, const ClientChannelPrx&, const MessageAuthenticatorPtr&); - virtual ~SUdpClient(); - - void serverHello(const CryptKeyPtr&); - - void serverKeyChange(const CryptKeyPtr&); - - void serverGoodbye(); - - void setNewCryptKey(Ice::Long, const CryptKeyPtr&); - - Ice::Long getClientID() const; - - const CryptKeyPtr& getCryptKey() const; - const CryptKeyPtr& getCryptKey(Ice::Long) const; - - const MessageAuthenticatorPtr& getMessageAuthenticator() const; - -protected: - Ice::Long _clientID; - ClientChannelPrx _clientChannel; - MessageAuthenticatorPtr _messageAuthenticator; - CryptKeyPtr _cryptKey; - -}; - -} - -#endif - - diff --git a/cpp/src/Ice/SUdpClientControlChannel.cpp b/cpp/src/Ice/SUdpClientControlChannel.cpp deleted file mode 100644 index 3cce8b5bb40..00000000000 --- a/cpp/src/Ice/SUdpClientControlChannel.cpp +++ /dev/null @@ -1,224 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/OpenSSL.h> -#include <Ice/Stream.h> -#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 <Ice/MessageAuthenticator.h> -#include <Ice/Cryptor.h> -#include <Ice/CryptKey.h> -#include <Ice/TraceLevels.h> -#include <Ice/Logger.h> -#include <sstream> - -using namespace std; -using namespace Ice; -using namespace SecureUdp; -using IceInternal::BasicStream; -using IceInternal::InstancePtr; -using IceInternal::SUdpTransceiver; -using IceInternal::Buffer; - -//////////////////////////////////////////////////////////////////////////////// -// Public Incoming Methods (from Ice Client Control Channel) -//////////////////////////////////////////////////////////////////////////////// - -void -SecureUdp::ClientControlChannel::serverHello(Long clientID, const ByteSeq& key, const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - _clientID = clientID; - - // TODO: There is a wierd segmentation fault happening here if I uncomment - // the call to serverKeyChangeMessage(). Dunno why. - // serverKeyChangeMessage(key); -} - -void -SecureUdp::ClientControlChannel::serverKeyChange(const ByteSeq& key, const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - serverKeyChangeMessage(key); -} - -void -SecureUdp::ClientControlChannel::serverGoodbye(const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - // TODO: Should find some way to shut down the Transceiver here. -} - -//////////////////////////////////////////////////////////////////////////////// -// Protected Methods -//////////////////////////////////////////////////////////////////////////////// - -SecureUdp::ClientControlChannel::ClientControlChannel(SUdpTransceiver* transceiver, - const InstancePtr& instance, - const std::string& host, - int port) : - ControlChannel(transceiver, instance) -{ - // 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(); - - const Ice::ObjectPrx& proxy = _adapter->createProxy(stringToIdentity(objectName.str())); - _clientProxy = ClientChannelPrx::uncheckedCast(proxy /* ->ice_oneway() */); - - // Create our connection to the Server channel - ostringstream ref; - ref << "sudpServer" << dec << port << ":ssl -p " << dec << port << " -h " << host; - Ice::ObjectPrx base = communicator->stringToProxy(ref.str()); - - ServerChannelPrx twoway; - - try - { - // ice_timeout(10)-> - twoway = ServerChannelPrx::checkedCast(base->ice_twoway()->ice_secure(true)); - } - catch ( Ice::Exception& expt ) - { - ostringstream exptString; - - exptString << "Exception: " << expt; - - throw; - } - - if (!twoway) - { - // TODO: Bad scene, bad object reference - } - - _serverChannel = ServerChannelPrx::uncheckedCast(twoway /* ->ice_oneway() */); - - _messageAuthenticator = new MessageAuthenticator(); - - _clientID = 0L; - _msgID = 0L; - - clientHello(); -} - -SecureUdp::ClientControlChannel::~ClientControlChannel() -{ - // Make it impossible for the control channel to access the Transceiver - // after transceiver destruction. - unsetTransceiver(); -} - -void -SecureUdp::ClientControlChannel::serverKeyChangeMessage(const ByteSeq& key) -{ - Long msgID = _msgID + 1; - - assert(_cryptor); - - // From this msgID onwards, use the indicated key - _encryptionKey = _cryptor->getOrCreateKey(key); - - assert(_serverChannel); - - _serverChannel->clientKeyAcknowledge(_clientID, msgID, _encryptionKey->toByteSeq()); -} - -void -SecureUdp::ClientControlChannel::clientHello() -{ - _serverChannel->clientHello(_clientProxy, _messageAuthenticator->getMACKey()); -} - - -//////////////////////////////////////////////////////////////////////////////// -// Incoming Methods (from SUdpTransceiver) -//////////////////////////////////////////////////////////////////////////////// - -void -SecureUdp::ClientControlChannel::encryptPacket(Buffer& buffer, Buffer& encryptedPacket) -{ - IceUtil::Mutex::Lock sync(_mutex); - - // We always, and ONLY, increment here. - ++_msgID; - - Long messageLength = buffer.b.end() - buffer.b.begin(); - - // 1. Compute the MAC - ByteSeq macBuffer = _messageAuthenticator->computeMAC(buffer.b); - - // 2. Append MAC to Message, produce signed message - BasicStream signedMessageStream(0); - signedMessageStream.write(messageLength); - signedMessageStream.write(buffer.b); - signedMessageStream.write(macBuffer); - - // 3. Encrypt signed message - ByteSeq signedMessage; - ByteSeq encryptedMessage; - signedMessageStream.read(signedMessage); - _cryptor->encrypt(_encryptionKey, signedMessage, encryptedMessage); - - // 4. Create record header - BasicStream headerStream(0); - Byte version = 1; - Long length = encryptedMessage.end() - encryptedMessage.begin(); - headerStream.write(version); - headerStream.write(_clientID); - headerStream.write(_msgID); - headerStream.write(length); - - // 5. Prepend header to encrypted message, create SUDP Packet - BasicStream sudpPacket(0); - ByteSeq header; - headerStream.read(header); - sudpPacket.write(header); - sudpPacket.write(encryptedMessage); - - // Pass the encrypted packet back. - sudpPacket.read(encryptedPacket.b); -} - -void -SecureUdp::ClientControlChannel::clientKeyRequest() -{ - _serverChannel->clientKeyRequest(_clientID); -} - - diff --git a/cpp/src/Ice/SUdpClientControlChannel.h b/cpp/src/Ice/SUdpClientControlChannel.h deleted file mode 100644 index f30eeb910c2..00000000000 --- a/cpp/src/Ice/SUdpClientControlChannel.h +++ /dev/null @@ -1,65 +0,0 @@ -// ********************************************************************** -// -// 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> -#include <Ice/Buffer.h> -#include <Ice/CryptKeyF.h> -#include <Ice/MessageAuthenticatorF.h> - -namespace SecureUdp -{ - -class ClientControlChannel : public ControlChannel, public ClientChannel -{ - -public: - - // Messages received from the Server - virtual void serverHello(Ice::Long, const Ice::ByteSeq&, const Ice::Current&); - virtual void serverKeyChange(const Ice::ByteSeq&, const Ice::Current&); - virtual void serverGoodbye(const Ice::Current&); - - -protected: - - // ClientControlChannel(const IceInternal::SUdpTransceiverPtr&, const Ice::InstancePtr&, const std::string&, int); - ClientControlChannel(IceInternal::SUdpTransceiver*, const IceInternal::InstancePtr&, const std::string&, int); - - virtual ~ClientControlChannel(); - - void serverKeyChangeMessage(const Ice::ByteSeq&); - void clientHello(); - - - friend IceInternal::SUdpTransceiver; - - // Called from the IceInternal::SUdpTransceiver - void encryptPacket(IceInternal::Buffer&, IceInternal::Buffer&); - void clientKeyRequest(); - - Ice::ObjectAdapterPtr _adapter; - ClientChannelPrx _clientProxy; - ServerChannelPrx _serverChannel; - - Ice::Long _msgID; - Ice::Long _clientID; - CryptKeyPtr _encryptionKey; - - MessageAuthenticatorPtr _messageAuthenticator; -}; - -} - -#endif - diff --git a/cpp/src/Ice/SUdpClientF.h b/cpp/src/Ice/SUdpClientF.h deleted file mode 100644 index fca64750658..00000000000 --- a/cpp/src/Ice/SUdpClientF.h +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SUDP_CLIENT_F_H -#define ICE_SUDP_CLIENT_F_H - -#include <Ice/Handle.h> - -namespace SecureUdp -{ - -class SUdpClient; -typedef IceInternal::Handle<SUdpClient> SUdpClientPtr; - -} - -namespace IceInternal -{ - -void incRef(::SecureUdp::SUdpClient*); -void decRef(::SecureUdp::SUdpClient*); - -} - -#endif - diff --git a/cpp/src/Ice/SUdpControlChannel.cpp b/cpp/src/Ice/SUdpControlChannel.cpp deleted file mode 100644 index 1711983ffca..00000000000 --- a/cpp/src/Ice/SUdpControlChannel.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/Logger.h> -#include <Ice/TraceLevels.h> -#include <Ice/SUdpControlChannel.h> -#include <Ice/Cryptor.h> -#include <Ice/Instance.h> - -using namespace std; -using namespace Ice; - -void ::IceInternal::incRef(::SecureUdp::ControlChannel* p) { p->__incRef(); } -void ::IceInternal::decRef(::SecureUdp::ControlChannel* p) { p->__decRef(); } - -SecureUdp::ControlChannel::ControlChannel(IceInternal::SUdpTransceiver* transceiver, - const IceInternal::InstancePtr& instance) : - _transceiver(transceiver), - _instance(instance), - _traceLevels(instance->traceLevels()), - _logger(instance->logger()) -{ - assert(transceiver); - - _cryptor = new Cryptor(); -} - -SecureUdp::ControlChannel::~ControlChannel() -{ - unsetTransceiver(); -} - -void -SecureUdp::ControlChannel::unsetTransceiver() -{ - IceUtil::Mutex::Lock sync(_mutex); - _transceiver = 0; -} - diff --git a/cpp/src/Ice/SUdpControlChannel.h b/cpp/src/Ice/SUdpControlChannel.h deleted file mode 100644 index ee3be1304ec..00000000000 --- a/cpp/src/Ice/SUdpControlChannel.h +++ /dev/null @@ -1,50 +0,0 @@ -// ********************************************************************** -// -// 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/LoggerF.h> -#include <Ice/TraceLevelsF.h> -#include <Ice/SUdpControlChannelF.h> -#include <Ice/SUdpTransceiverF.h> -#include <Ice/CryptorF.h> - -namespace SecureUdp -{ - -class ControlChannel : public virtual IceUtil::Shared -{ - -protected: - // ControlChannel(const IceInternal::SUdpTransceiverPtr&, const IceInternal::InstancePtr&); - ControlChannel(IceInternal::SUdpTransceiver*, const IceInternal::InstancePtr&); - virtual ~ControlChannel(); - - virtual void unsetTransceiver(); - - friend IceInternal::SUdpTransceiver; - - // IceInternal::SUdpTransceiverPtr _transceiver; - IceInternal::SUdpTransceiver* _transceiver; - IceInternal::InstancePtr _instance; - IceInternal::TraceLevelsPtr _traceLevels; - Ice::LoggerPtr _logger; - IceUtil::Mutex _mutex; - CryptorPtr _cryptor; -}; - -} - -#endif - diff --git a/cpp/src/Ice/SUdpControlChannelF.h b/cpp/src/Ice/SUdpControlChannelF.h deleted file mode 100644 index e19c7189bee..00000000000 --- a/cpp/src/Ice/SUdpControlChannelF.h +++ /dev/null @@ -1,32 +0,0 @@ -// ********************************************************************** -// -// 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 SecureUdp -{ - -class ControlChannel; -typedef IceInternal::Handle<ControlChannel> ControlChannelPtr; - -} - -namespace IceInternal -{ - -void incRef(::SecureUdp::ControlChannel*); -void decRef(::SecureUdp::ControlChannel*); - -} - -#endif diff --git a/cpp/src/Ice/SUdpServerControlChannel.cpp b/cpp/src/Ice/SUdpServerControlChannel.cpp deleted file mode 100644 index 881c88caba2..00000000000 --- a/cpp/src/Ice/SUdpServerControlChannel.cpp +++ /dev/null @@ -1,229 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/OpenSSL.h> -#include <Ice/Buffer.h> -#include <Ice/SUdpServerControlChannel.h> -#include <Ice/SUdpClient.h> -#include <Ice/Instance.h> -#include <Ice/Communicator.h> -#include <Ice/ObjectAdapter.h> -#include <Ice/IdentityUtil.h> -#include <Ice/SUdpTransceiver.h> -#include <Ice/MessageAuthenticator.h> -#include <Ice/Cryptor.h> -#include <Ice/BasicStream.h> -#include <Ice/TraceLevels.h> -#include <Ice/Logger.h> -#include <sstream> - -using namespace std; -using namespace Ice; -using namespace SecureUdp; -using IceInternal::Buffer; -using IceInternal::BasicStream; -using IceInternal::InstancePtr; -using IceInternal::SUdpTransceiver; - -void -SecureUdp::ServerControlChannel::clientHello(const ClientChannelPrx& client, - const ByteSeq& MACkey, - const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - Long clientID = getNewClientID(); - - MessageAuthenticatorPtr messageAuthenticator = new MessageAuthenticator(MACkey); - - SUdpClientPtr sudpClient = new SUdpClient(clientID, client, messageAuthenticator); - - assert(_cryptor); - - CryptKeyPtr cryptKey = _cryptor->getNewKey(); - - sudpClient->serverHello(cryptKey); - - newSUdpClient(sudpClient); -} - -void -SecureUdp::ServerControlChannel::clientKeyAcknowledge(Long clientID, - Long msgID, - const ByteSeq& key, - const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - SUdpClientPtr sudpClient = getSUdpClient(clientID); - - CryptKeyPtr cryptKey = _cryptor->getKey(key); - - sudpClient->setNewCryptKey(msgID, cryptKey); -} - -void -SecureUdp::ServerControlChannel::clientKeyRequest(Long clientID, const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - SUdpClientPtr sudpClient = getSUdpClient(clientID); - - CryptKeyPtr cryptKey = _cryptor->getNewKey(); - - sudpClient->serverKeyChange(cryptKey); -} - -void -SecureUdp::ServerControlChannel::clientGoodbye(Long clientID, const Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - - deleteSUdpClient(clientID); -} - -// SecureUdp::ServerControlChannel::ServerControlChannel(const SUdpTransceiverPtr& transceiver, -SecureUdp::ServerControlChannel::ServerControlChannel(SUdpTransceiver* transceiver, - const InstancePtr& instance, - int port) : - ControlChannel(transceiver, instance) -{ - _clientIDGenerator = 0L; - - // 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 << " -h 127.0.0.1"; - - // 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(); -} - -SecureUdp::ServerControlChannel::~ServerControlChannel() -{ - // Make it impossible for the control channel to access the Transceiver - // after transceiver destruction. - unsetTransceiver(); -} - -void -SecureUdp::ServerControlChannel::decryptPacket(Buffer& encryptedPacket, Buffer& decryptedPacket) -{ - IceUtil::Mutex::Lock sync(_mutex); - - // Header information at the beginning of the packet. - Byte version; - Long clientID; - Long msgID; - Long length; - - // The encrypted message, final portion of the packet. - ByteSeq encryptedMessage; - - - // 1. Break apart header and encrypted Message - BasicStream sudpPacket(0); - sudpPacket.read(version); - sudpPacket.read(clientID); - sudpPacket.read(msgID); - sudpPacket.read(length); - sudpPacket.read(encryptedMessage); - - // TODO: Perform version check here. - - // Check to make sure the encrypted message is the correct length - Long messageLength = encryptedMessage.end() - encryptedMessage.begin(); - if (messageLength != length) - { - // TODO: Bad scene, this message is not the right length! - } - - - // 2. Decrypt the Encrypted message - ByteSeq signedMessage; - SUdpClientPtr sudpClient = getSUdpClient(clientID); - CryptKeyPtr cryptKey = sudpClient->getCryptKey(msgID); - _cryptor->decrypt(cryptKey, encryptedMessage, signedMessage); - - - // 3. Split out the message and MAC code from the signedMessage - // Note: We're reusing the messageLength variable here. - BasicStream signedMessageStream(0); - ByteSeq messageAndMAC; - signedMessageStream.write(signedMessage); - signedMessageStream.read(messageLength); - signedMessageStream.read(messageAndMAC); - ByteSeq::iterator current = messageAndMAC.begin(); - ByteSeq::iterator macPos = current + messageLength; - ByteSeq::iterator end = messageAndMAC.end(); - ByteSeq message(current, macPos); - ByteSeq macCode(macPos, end); - - - // 4. Compute MAC and compare - MessageAuthenticatorPtr messageAuthenticator = sudpClient->getMessageAuthenticator(); - if (messageAuthenticator->authenticate(message, macCode)) - { - // TODO: Bad scene, the MAC codes don't match, this message is invalid! - } - - decryptedPacket.b = message; -} - -Long -SecureUdp::ServerControlChannel::getNewClientID() -{ - IceUtil::Mutex::Lock sync(_clientIDMutex); - return ++_clientIDGenerator; -} - -SUdpClientPtr& -SecureUdp::ServerControlChannel::getSUdpClient(Long clientID) -{ - IceUtil::Mutex::Lock sync(_clientMapMutex); - - return _clientMap[clientID]; -} - -void -SecureUdp::ServerControlChannel::newSUdpClient(const SUdpClientPtr& sudpClient) -{ - IceUtil::Mutex::Lock sync(_clientMapMutex); - - pair<Long, SUdpClientPtr> clientPair(sudpClient->getClientID(), sudpClient); - - _clientMap.insert(clientPair); -} - -void -SecureUdp::ServerControlChannel::deleteSUdpClient(Long clientID) -{ - IceUtil::Mutex::Lock sync(_clientMapMutex); - - _clientMap.erase(clientID); -} - diff --git a/cpp/src/Ice/SUdpServerControlChannel.h b/cpp/src/Ice/SUdpServerControlChannel.h deleted file mode 100644 index e6145951c99..00000000000 --- a/cpp/src/Ice/SUdpServerControlChannel.h +++ /dev/null @@ -1,74 +0,0 @@ -// ********************************************************************** -// -// 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> -#include <IceUtil/Mutex.h> -#include <Ice/Buffer.h> -#include <Ice/SUdpClientF.h> -#include <map> - -namespace SecureUdp -{ - -// typedef pair<Ice::Long, CryptKeyPtr> MsgKeyPair; -// typedef vector<MsgKeyPair> MsgKeyVector; - -// Encryption key and historical list -// MsgKeyVector _msgEncryptionKeys; -// MsgKeyPair _currentEncryptionInfo; - -typedef std::map<Ice::Long, SUdpClientPtr> SUdpClientMap; - -class ServerControlChannel : public ControlChannel, public ServerChannel -{ - -public: - - // Messages received from Client - virtual void clientHello(const ClientChannelPrx&, const Ice::ByteSeq&, const Ice::Current&); - virtual void clientKeyAcknowledge(Ice::Long, Ice::Long, const Ice::ByteSeq&, const Ice::Current&); - virtual void clientKeyRequest(Ice::Long, const Ice::Current&); - virtual void clientGoodbye(Ice::Long, const Ice::Current&); - -protected: - - // ServerControlChannel(const IceInternal::SUdpTransceiverPtr&, const InstancePtr&, int); - ServerControlChannel(IceInternal::SUdpTransceiver*, const IceInternal::InstancePtr&, int); - - virtual ~ServerControlChannel(); - - friend IceInternal::SUdpTransceiver; - - void decryptPacket(IceInternal::Buffer&, IceInternal::Buffer&); - Ice::Long getNewClientID(); - - SUdpClientPtr& getSUdpClient(Ice::Long); - void newSUdpClient(const SUdpClientPtr&); - void deleteSUdpClient(Ice::Long); - - Ice::ObjectAdapterPtr _adapter; - - // Keep a listing of all clients connected to us. - SUdpClientMap _clientMap; - IceUtil::Mutex _clientMapMutex; - - // Generate unique Client ID numbers - Ice::Long _clientIDGenerator; - IceUtil::Mutex _clientIDMutex; -}; - -} - -#endif - diff --git a/cpp/src/Ice/SUdpTransceiver.cpp b/cpp/src/Ice/SUdpTransceiver.cpp deleted file mode 100644 index 8456a17b624..00000000000 --- a/cpp/src/Ice/SUdpTransceiver.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/OpenSSL.h>
-#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 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(); -} - -IceInternal::SUdpTransceiver::SUdpTransceiver(const InstancePtr& instance, const string& host, int port) : - _udpTransceiver(instance, host, port, "sudp"), - _instance(instance), - _traceLevels(instance->traceLevels()), - _logger(instance->logger()) -{ - // Perform our handshake with the server - connectControlChannel(host, port); -} - -IceInternal::SUdpTransceiver::SUdpTransceiver(const InstancePtr& instance, int port, bool connect) : - _udpTransceiver(instance, port, connect, "sudp"), - _instance(instance), - _traceLevels(instance->traceLevels()), - _logger(instance->logger()) -{ - // Build our control channel - createControlChannel(port); -} - -IceInternal::SUdpTransceiver::~SUdpTransceiver() -{ - _controlChannel->unsetTransceiver(); -} - -void -IceInternal::SUdpTransceiver::connectControlChannel(const 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); -} - diff --git a/cpp/src/Ice/SUdpTransceiver.h b/cpp/src/Ice/SUdpTransceiver.h deleted file mode 100644 index 1a1e3375ca8..00000000000 --- a/cpp/src/Ice/SUdpTransceiver.h +++ /dev/null @@ -1,81 +0,0 @@ -// ********************************************************************** -// -// 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/SecureUdpF.h> -#include <Ice/Stream.h> -#include <Ice/UdpTransceiver.h> -#include <Ice/SUdpTransceiverF.h> -#include <map> - -#ifndef WIN32 -# include <netinet/in.h> // For struct sockaddr_in -#endif - -namespace IceInternal -{ - -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 SecureUdp::ClientChannelPtr&, const Ice::ByteSeq&); - void clientKeyAcknowledge(Ice::Long, Ice::Long, const Ice::ByteSeq&); - void clientKeyRequest(Ice::Long); - void clientGoodbye(Ice::Long); - - // Client Channel Implementation methods - void serverHello(Ice::Long, const Ice::ByteSeq&); - void serverKeyChange(const Ice::ByteSeq&); - void serverGoodbye(); - -private: - - SUdpTransceiver(const InstancePtr&, const std::string&, int); - SUdpTransceiver(const InstancePtr&, int, bool); - virtual ~SUdpTransceiver(); - - friend class SUdpEndpoint; - - void connectControlChannel(const std::string&, int); - void createControlChannel(int); - - UdpTransceiver _udpTransceiver; - SecureUdp::ControlChannelPtr _controlChannel; - - InstancePtr _instance; - TraceLevelsPtr _traceLevels; - ::Ice::LoggerPtr _logger; -}; - -} - -#endif - diff --git a/cpp/src/Ice/SUdpTransceiverF.h b/cpp/src/Ice/SUdpTransceiverF.h deleted file mode 100644 index f46bd48b8a8..00000000000 --- a/cpp/src/Ice/SUdpTransceiverF.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// 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.h b/cpp/src/Ice/UdpTransceiver.h index 5b80265fbbb..6e92c1e7ea3 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -49,8 +49,8 @@ private: virtual ~UdpTransceiver(); friend class UdpEndpoint; - friend class SUdpEndpoint; // TODO: Remove as soon as SUdpEndpoint uses SUdpTransceiver. - friend class SUdpTransceiver; +// friend class SUdpEndpoint; // TODO: Remove as soon as SUdpEndpoint uses SUdpTransceiver. +// friend class SUdpTransceiver; InstancePtr _instance; TraceLevelsPtr _traceLevels; diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index 55013a0cb6b..934978edb61 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -112,10 +112,30 @@ SOURCE=.\Application.cpp # End Source File
# Begin Source File
+SOURCE=.\BaseCerts.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\BasicStream.cpp
# End Source File
# Begin Source File
+SOURCE=.\CertificateAuthority.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CertificateDesc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CertificateVerifier.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CertificateVerifierOpenSSL.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Communicator.cpp
# End Source File
# Begin Source File
@@ -124,6 +144,14 @@ SOURCE=.\CommunicatorI.cpp # End Source File
# Begin Source File
+SOURCE=.\ConfigParser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ConfigParserErrorReporter.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Connection.cpp
# End Source File
# Begin Source File
@@ -136,11 +164,15 @@ SOURCE=.\Connector.cpp # End Source File
# Begin Source File
-SOURCE=.\CryptKey.cpp
+SOURCE=.\ContextOpenSSL.cpp
# End Source File
# Begin Source File
-SOURCE=.\Cryptor.cpp
+SOURCE=.\ContextOpenSSLClient.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ContextOpenSSLServer.cpp
# End Source File
# Begin Source File
@@ -168,6 +200,10 @@ SOURCE=.\Exception.cpp # End Source File
# Begin Source File
+SOURCE=.\GeneralConfig.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Identity.cpp
# End Source File
# Begin Source File
@@ -208,10 +244,6 @@ SOURCE=.\LoggerUtil.cpp # End Source File
# Begin Source File
-SOURCE=.\MessageAuthenticator.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Network.cpp
# End Source File
# Begin Source File
@@ -240,6 +272,14 @@ SOURCE=.\ObjectFactoryManager.cpp # End Source File
# Begin Source File
+SOURCE=.\OpenSSLJanitors.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\OpenSSLUtils.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Outgoing.cpp
# End Source File
# Begin Source File
@@ -284,55 +324,31 @@ SOURCE=.\RoutingTable.cpp # End Source File
# Begin Source File
-SOURCE=.\SecureUdp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SslException.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SslException2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ServantLocator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SingleCertificateVerifier.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\SslAcceptor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BaseCerts.cpp
+SOURCE=.\RSACertificateGen.cpp
# End Source File
# Begin Source File
-SOURCE=.\CertificateAuthority.cpp
+SOURCE=.\RSAKeyPair.cpp
# End Source File
# Begin Source File
-SOURCE=.\CertificateDesc.cpp
+SOURCE=.\RSAPrivateKey.cpp
# End Source File
# Begin Source File
-SOURCE=.\CertificateVerifier.cpp
+SOURCE=.\RSAPublicKey.cpp
# End Source File
# Begin Source File
-SOURCE=.\CertificateVerifierOpenSSL.cpp
+SOURCE=.\ServantLocator.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConfigParser.cpp
+SOURCE=.\SingleCertificateVerifier.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConfigParserErrorReporter.cpp
+SOURCE=.\SslAcceptor.cpp
# End Source File
# Begin Source File
@@ -356,15 +372,11 @@ SOURCE=.\SslConnector.cpp # End Source File
# Begin Source File
-SOURCE=.\ContextOpenSSL.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContextOpenSSLClient.cpp
+SOURCE=.\SslException.cpp
# End Source File
# Begin Source File
-SOURCE=.\ContextOpenSSLServer.cpp
+SOURCE=.\SslException2.cpp
# End Source File
# Begin Source File
@@ -380,47 +392,39 @@ SOURCE=.\SslFactory.cpp # End Source File
# Begin Source File
-SOURCE=.\GeneralConfig.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\SslIceUtils.cpp
# End Source File
# Begin Source File
-SOURCE=.\OpenSSLJanitors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\OpenSSLUtils.cpp
+SOURCE=.\SslTransceiver.cpp
# End Source File
# Begin Source File
-SOURCE=.\RSACertificateGen.cpp
+SOURCE=.\Stream.cpp
# End Source File
# Begin Source File
-SOURCE=.\RSAKeyPair.cpp
+SOURCE=.\System.cpp
# End Source File
# Begin Source File
-SOURCE=.\RSAPrivateKey.cpp
+SOURCE=.\SystemInternal.cpp
# End Source File
# Begin Source File
-SOURCE=.\RSAPublicKey.cpp
+SOURCE=.\SystemOpenSSL.cpp
# End Source File
# Begin Source File
-SOURCE=.\System.cpp
+SOURCE=.\TcpAcceptor.cpp
# End Source File
# Begin Source File
-SOURCE=.\SystemInternal.cpp
+SOURCE=.\TcpConnector.cpp
# End Source File
# Begin Source File
-SOURCE=.\SystemOpenSSL.cpp
+SOURCE=.\TcpTransceiver.cpp
# End Source File
# Begin Source File
@@ -428,111 +432,107 @@ SOURCE=.\TempCerts.cpp # End Source File
# Begin Source File
-SOURCE=.\SslTransceiver.cpp
+SOURCE=.\ThreadPool.cpp
# End Source File
# Begin Source File
-SOURCE=.\Stream.cpp
+SOURCE=.\TraceLevels.cpp
# End Source File
# Begin Source File
-SOURCE=.\SUdpClient.cpp
+SOURCE=.\TraceUtil.cpp
# End Source File
# Begin Source File
-SOURCE=.\SUdpClientControlChannel.cpp
+SOURCE=.\Transceiver.cpp
# End Source File
# Begin Source File
-SOURCE=.\SUdpControlChannel.cpp
+SOURCE=.\UdpTransceiver.cpp
# End Source File
# Begin Source File
-SOURCE=.\SUdpServerControlChannel.cpp
+SOURCE=.\UserExceptionFactory.cpp
# End Source File
# Begin Source File
-SOURCE=.\SUdpTransceiver.cpp
+SOURCE=.\UserExceptionFactoryManager.cpp
# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Header Files"
-SOURCE=.\TcpAcceptor.cpp
-# End Source File
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\TcpConnector.cpp
+SOURCE=.\Acceptor.h
# End Source File
# Begin Source File
-SOURCE=.\TcpTransceiver.cpp
+SOURCE=.\AcceptorF.h
# End Source File
# Begin Source File
-SOURCE=.\ThreadPool.cpp
+SOURCE=..\..\include\Ice\Application.h
# End Source File
# Begin Source File
-SOURCE=.\TraceLevels.cpp
+SOURCE=.\BaseCerts.h
# End Source File
# Begin Source File
-SOURCE=.\TraceUtil.cpp
+SOURCE=..\..\include\Ice\BasicStream.h
# End Source File
# Begin Source File
-SOURCE=.\Transceiver.cpp
+SOURCE=..\..\include\Ice\Buffer.h
# End Source File
# Begin Source File
-SOURCE=.\UdpTransceiver.cpp
+SOURCE=.\CertificateAuthority.h
# End Source File
# Begin Source File
-SOURCE=.\UserExceptionFactory.cpp
+SOURCE=.\CertificateDesc.h
# End Source File
# Begin Source File
-SOURCE=.\UserExceptionFactoryManager.cpp
+SOURCE=..\..\include\Ice\CertificateVerifier.h
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\Acceptor.h
+SOURCE=..\..\include\Ice\CertificateVerifierF.h
# End Source File
# Begin Source File
-SOURCE=.\AcceptorF.h
+SOURCE=..\..\include\Ice\CertificateVerifierOpenSSL.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\Application.h
+SOURCE=.\CertificateVerifierOpenSSL.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\BasicStream.h
+SOURCE=..\..\include\Ice\Communicator.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\Buffer.h
+SOURCE=..\..\include\Ice\CommunicatorF.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\Communicator.h
+SOURCE=.\CommunicatorI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\CommunicatorF.h
+SOURCE=..\..\include\Ice\Config.h
# End Source File
# Begin Source File
-SOURCE=.\CommunicatorI.h
+SOURCE=.\ConfigParser.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\Config.h
+SOURCE=.\ConfigParserErrorReporter.h
# End Source File
# Begin Source File
@@ -560,19 +560,19 @@ SOURCE=.\ConnectorF.h # End Source File
# Begin Source File
-SOURCE=.\CryptKey.h
+SOURCE=.\ContextOpenSSL.h
# End Source File
# Begin Source File
-SOURCE=.\CryptKeyF.h
+SOURCE=.\ContextOpenSSLClient.h
# End Source File
# Begin Source File
-SOURCE=.\Cryptor.h
+SOURCE=.\ContextOpenSSLF.h
# End Source File
# Begin Source File
-SOURCE=.\CryptorF.h
+SOURCE=.\ContextOpenSSLServer.h
# End Source File
# Begin Source File
@@ -612,6 +612,10 @@ SOURCE=..\..\include\Ice\Functional.h # End Source File
# Begin Source File
+SOURCE=.\GeneralConfig.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\Ice\Handle.h
# End Source File
# Begin Source File
@@ -672,14 +676,6 @@ SOURCE=..\..\include\Ice\LoggerUtil.h # End Source File
# Begin Source File
-SOURCE=.\MessageAuthenticator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MessageAuthenticatorF.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\include\Ice\Native.h
# End Source File
# Begin Source File
@@ -736,6 +732,14 @@ SOURCE=.\OpenSSL.h # End Source File
# Begin Source File
+SOURCE=.\OpenSSLJanitors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\OpenSSLUtils.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\Ice\Outgoing.h
# End Source File
# Begin Source File
@@ -832,63 +836,55 @@ SOURCE=..\..\include\Ice\RoutingTableF.h # End Source File
# Begin Source File
-SOURCE=.\SecureUdp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\Security.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\ServantLocator.h
+SOURCE=..\..\include\Ice\RSACertificateGen.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\ServantLocatorF.h
+SOURCE=..\..\include\Ice\RSACertificateGenF.h
# End Source File
# Begin Source File
-SOURCE=.\SingleCertificateVerifier.h
+SOURCE=..\..\include\Ice\RSAKeyPair.h
# End Source File
# Begin Source File
-SOURCE=.\SslAcceptor.h
+SOURCE=..\..\include\Ice\RSAKeyPairF.h
# End Source File
# Begin Source File
-SOURCE=.\BaseCerts.h
+SOURCE=..\..\include\Ice\RSAPrivateKey.h
# End Source File
# Begin Source File
-SOURCE=.\CertificateAuthority.h
+SOURCE=..\..\include\Ice\RSAPrivateKeyF.h
# End Source File
# Begin Source File
-SOURCE=.\CertificateDesc.h
+SOURCE=..\..\include\Ice\RSAPublicKey.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\CertificateVerifier.h
+SOURCE=..\..\include\Ice\RSAPublicKeyF.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\CertificateVerifierF.h
+SOURCE=..\..\include\Ice\Security.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\CertificateVerifierOpenSSL.h
+SOURCE=..\..\include\Ice\ServantLocator.h
# End Source File
# Begin Source File
-SOURCE=.\CertificateVerifierOpenSSL.h
+SOURCE=..\..\include\Ice\ServantLocatorF.h
# End Source File
# Begin Source File
-SOURCE=.\ConfigParser.h
+SOURCE=.\SingleCertificateVerifier.h
# End Source File
# Begin Source File
-SOURCE=.\ConfigParserErrorReporter.h
+SOURCE=.\SslAcceptor.h
# End Source File
# Begin Source File
@@ -920,22 +916,6 @@ SOURCE=.\SslConnector.h # End Source File
# Begin Source File
-SOURCE=.\ContextOpenSSL.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContextOpenSSLClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContextOpenSSLF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContextOpenSSLServer.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\include\Ice\SslExtension.h
# End Source File
# Begin Source File
@@ -952,51 +932,23 @@ SOURCE=.\SslFactory.h # End Source File
# Begin Source File
-SOURCE=.\GeneralConfig.h
-# End Source File
-# Begin Source File
-
SOURCE=.\SslIceUtils.h
# End Source File
# Begin Source File
-SOURCE=.\OpenSSLJanitors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\OpenSSLUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RSACertificateGen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RSACertificateGenF.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RSAKeyPair.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RSAKeyPairF.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\RSAPrivateKey.h
+SOURCE=.\SslTransceiver.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\RSAPrivateKeyF.h
+SOURCE=..\..\include\Ice\Stream.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\RSAPublicKey.h
+SOURCE=..\..\include\Ice\StreamF.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\RSAPublicKeyF.h
+SOURCE=.\StreamI.h
# End Source File
# Begin Source File
@@ -1020,58 +972,6 @@ SOURCE=.\SystemOpenSSL.h # End Source File
# Begin Source File
-SOURCE=.\TempCerts.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SslTransceiver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\StreamF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StreamI.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpClientControlChannel.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpClientF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpControlChannel.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpControlChannelF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpServerControlChannel.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpTransceiver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUdpTransceiverF.h
-# End Source File
-# Begin Source File
-
SOURCE=.\TcpAcceptor.h
# End Source File
# Begin Source File
@@ -1084,6 +984,10 @@ SOURCE=.\TcpTransceiver.h # End Source File
# Begin Source File
+SOURCE=.\TempCerts.h
+# End Source File
+# Begin Source File
+
SOURCE=.\ThreadPool.h
# End Source File
# Begin Source File
@@ -1179,6 +1083,86 @@ BuildCmds= \ # End Source File
# Begin Source File
+SOURCE=..\..\slice\Ice\CertificateVerifier.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__CERTI="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\CertificateVerifier.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifier.ice \
+ move CertificateVerifier.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\CertificateVerifier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"CertificateVerifier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__CERTI="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\CertificateVerifier.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifier.ice \
+ move CertificateVerifier.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\CertificateVerifier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"CertificateVerifier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Ice\CertificateVerifierF.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__CERTIF="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\CertificateVerifierF.ice
+
+"..\..\include\Ice\CertificateVerifierF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifierF.ice
+ move CertificateVerifierF.h ..\..\include\Ice
+ del CertificateVerifierF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__CERTIF="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\CertificateVerifierF.ice
+
+"..\..\include\Ice\CertificateVerifierF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifierF.ice
+ move CertificateVerifierF.h ..\..\include\Ice
+ del CertificateVerifierF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\slice\Ice\Communicator.ice
!IF "$(CFG)" == "Ice - Win32 Release"
@@ -1874,124 +1858,6 @@ InputPath=..\..\slice\Ice\RouterF.ice # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\SecureUdp.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__SECUR="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SecureUdp.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdp.ice \
-
-
-"SecureUdp.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"SecureUdp.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__SECUR="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SecureUdp.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdp.ice \
-
-
-"SecureUdp.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"SecureUdp.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\SecureUdpF.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__SECURE="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SecureUdpF.ice
-
-"SecureUdpF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdpF.ice
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__SECURE="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SecureUdpF.ice
-
-"SecureUdpF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --include-dir Ice -I../../slice ../../slice/Ice/SecureUdpF.ice
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\SslException.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SslException.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SslException.ice \
- move SslException.h ..\..\include\Ice \
-
-
-"..\..\include\Ice\SslException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"SslException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__SECURI="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\SslException.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SslException.ice \
- move SslException.h ..\..\include\Ice \
-
-
-"..\..\include\Ice\SslException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"SslException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=..\..\slice\Ice\ServantLocator.ice
!IF "$(CFG)" == "Ice - Win32 Release"
@@ -2072,43 +1938,42 @@ InputPath=..\..\slice\Ice\ServantLocatorF.ice # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\CertificateVerifier.ice
+SOURCE=..\..\slice\Ice\SslException.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__SSLCE="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\CertificateVerifier.ice
+InputPath=..\..\slice\Ice\SslException.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifier.ice \
- move CertificateVerifier.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SslException.ice \
+ move SslException.h ..\..\include\Ice \
-"..\..\include\Ice\CertificateVerifier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\SslException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"CertificateVerifier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"SslException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__SSLCE="../../bin/slice2cpp.exe"
+USERDEP__SSLEX="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\CertificateVerifier.ice
+InputPath=..\..\slice\Ice\SslException.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifier.ice \
- move CertificateVerifier.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SslException.ice \
+ move SslException.h ..\..\include\Ice \
-"..\..\include\Ice\CertificateVerifier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\SslException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"CertificateVerifier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"SslException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -2117,46 +1982,11 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\CertificateVerifierF.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__SSLCER="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\CertificateVerifierF.ice
-
-"..\..\include\Ice\CertificateVerifierF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifierF.ice
- move CertificateVerifierF.h ..\..\include\Ice
- del CertificateVerifierF.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__SSLCER="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\CertificateVerifierF.ice
-
-"..\..\include\Ice\CertificateVerifierF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/CertificateVerifierF.ice
- move CertificateVerifierF.h ..\..\include\Ice
- del CertificateVerifierF.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=..\..\slice\Ice\SslExtension.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__SSLEX="../../bin/slice2cpp.exe"
+USERDEP__SSLEXT="../../bin/slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Ice\SslExtension.ice
@@ -2175,7 +2005,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__SSLEX="../../bin/slice2cpp.exe"
+USERDEP__SSLEXT="../../bin/slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Ice\SslExtension.ice
@@ -2201,7 +2031,7 @@ SOURCE=..\..\slice\Ice\SslExtensionF.ice !IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__SSLEXT="../../bin/slice2cpp.exe"
+USERDEP__SSLEXTE="../../bin/slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Ice\SslExtensionF.ice
@@ -2215,7 +2045,7 @@ InputPath=..\..\slice\Ice\SslExtensionF.ice !ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__SSLEXT="../../bin/slice2cpp.exe"
+USERDEP__SSLEXTE="../../bin/slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Ice\SslExtensionF.ice
@@ -2232,43 +2062,43 @@ InputPath=..\..\slice\Ice\SslExtensionF.ice # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\System.ice
+SOURCE=..\..\slice\Ice\Stream.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__SSLSY="../../bin/slice2cpp.exe"
+USERDEP__STREA="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\System.ice
+InputPath=..\..\slice\Ice\Stream.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/System.ice \
- move System.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \
+ move Stream.h ..\..\include\Ice \
-"..\..\include\Ice\System.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"System.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__SSLSY="../../bin/slice2cpp.exe"
+USERDEP__STREA="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\System.ice
+InputPath=..\..\slice\Ice\Stream.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/System.ice \
- move System.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \
+ move Stream.h ..\..\include\Ice \
-"..\..\include\Ice\System.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"System.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -2277,33 +2107,33 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\SystemF.ice
+SOURCE=..\..\slice\Ice\StreamF.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__SSLSYS="../../bin/slice2cpp.exe"
+USERDEP__STREAM="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\SystemF.ice
+InputPath=..\..\slice\Ice\StreamF.ice
-"..\..\include\Ice\SystemF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SystemF.ice
- move SystemF.h ..\..\include\Ice
- del SystemF.cpp
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice
+ move StreamF.h ..\..\include\Ice
+ del StreamF.cpp
# End Custom Build
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__SSLSYS="../../bin/slice2cpp.exe"
+USERDEP__STREAM="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\SystemF.ice
+InputPath=..\..\slice\Ice\StreamF.ice
-"..\..\include\Ice\SystemF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SystemF.ice
- move SystemF.h ..\..\include\Ice
- del SystemF.cpp
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice
+ move StreamF.h ..\..\include\Ice
+ del StreamF.cpp
# End Custom Build
@@ -2312,43 +2142,43 @@ InputPath=..\..\slice\Ice\SystemF.ice # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\Stream.ice
+SOURCE=..\..\slice\Ice\System.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__STREA="../../bin/slice2cpp.exe"
+USERDEP__SYSTE="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\Stream.ice
+InputPath=..\..\slice\Ice\System.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \
- move Stream.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/System.ice \
+ move System.h ..\..\include\Ice \
-"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\System.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"System.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__STREA="../../bin/slice2cpp.exe"
+USERDEP__SYSTE="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\Stream.ice
+InputPath=..\..\slice\Ice\System.ice
BuildCmds= \
set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \
- move Stream.h ..\..\include\Ice \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/System.ice \
+ move System.h ..\..\include\Ice \
-"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\System.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"System.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -2357,33 +2187,33 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\StreamF.ice
+SOURCE=..\..\slice\Ice\SystemF.ice
!IF "$(CFG)" == "Ice - Win32 Release"
-USERDEP__STREAM="../../bin/slice2cpp.exe"
+USERDEP__SYSTEM="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\StreamF.ice
+InputPath=..\..\slice\Ice\SystemF.ice
-"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\SystemF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice
- move StreamF.h ..\..\include\Ice
- del StreamF.cpp
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SystemF.ice
+ move SystemF.h ..\..\include\Ice
+ del SystemF.cpp
# End Custom Build
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-USERDEP__STREAM="../../bin/slice2cpp.exe"
+USERDEP__SYSTEM="../../bin/slice2cpp.exe"
# Begin Custom Build
-InputPath=..\..\slice\Ice\StreamF.ice
+InputPath=..\..\slice\Ice\SystemF.ice
-"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Ice\SystemF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice
- move StreamF.h ..\..\include\Ice
- del StreamF.cpp
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/SystemF.ice
+ move SystemF.h ..\..\include\Ice
+ del SystemF.cpp
# End Custom Build
|