zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/UdpTransceiver.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -61,6 +61,7 @@ public:
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
     virtual void checkSendSize(const Buffer&);
+    virtual void setBufferSize(int rcvSize, int sndSize);
 
     int effectivePort() const;
 
@@ -72,7 +73,7 @@ private:
 
     virtual ~UdpTransceiver();
 
-    void setBufSize(const Ice::PropertiesPtr&);
+    void setBufSize(int, int);
 
 #ifdef ICE_OS_WINRT
     bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^);

data/ext/ice/cpp/src/Ice/Version.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,18 +28,24 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 namespace Ice
 {
-#ifdef ICE_HAS_DECLSPEC_IMPORT_EXPORT
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::Ice::ProtocolVersion, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::Ice::ProtocolVersion, ::IceInternal::BasicStream>;
 #endif
-#ifdef ICE_HAS_DECLSPEC_IMPORT_EXPORT
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::Ice::EncodingVersion, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::Ice::EncodingVersion, ::IceInternal::BasicStream>;
 #endif

data/ext/ice/cpp/src/Ice/WSAcceptor.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/WSAcceptor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/WSConnector.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/WSConnector.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/WSEndpoint.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -14,6 +14,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/IPEndpointI.h>
 #include <Ice/HashUtil.h>
+#include <Ice/EndpointFactoryManager.h>
 
 using namespace std;
 using namespace Ice;
@@ -26,8 +27,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
 {
 }
 
-IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, vector<string>& args) :
-    _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del))
+IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector<string>& args) :
+    _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del))
 {
     initWithOptions(args);
 
@@ -46,41 +47,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
 Ice::EndpointInfoPtr
 IceInternal::WSEndpoint::getInfo() const
 {
-    class InfoI : public WSEndpointInfo
-    {
-    public:
-
-        InfoI(const EndpointIPtr& e) : _endpoint(e)
-        {
-        }
-
-        virtual Short
-        type() const
-        {
-            return _endpoint->type();
-        }
-
-        virtual bool
-        datagram() const
-        {
-            return _endpoint->datagram();
-        }
-
-        virtual bool
-        secure() const
-        {
-            return _endpoint->secure();
-        }
-
-    private:
-
-        const EndpointIPtr _endpoint;
-    };
-
-    WSEndpointInfoPtr info = new InfoI(const_cast<WSEndpoint*>(this));
-    _delegate->fillEndpointInfo(info.get());
-    info->resource = _resource;
-    return info;
+    assert(dynamic_cast<WSEndpointDelegate*>(_delegate.get()));
+    return dynamic_cast<WSEndpointDelegate*>(_delegate.get())->getWSInfo(_resource);
 }
 
 Ice::Short

data/ext/ice/cpp/src/Ice/WSEndpoint.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -20,6 +20,17 @@
 namespace IceInternal
 {
 
+//
+// Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
+// delegate to.
+//
+class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
+{
+public:
+
+    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
+};
+
 class WSEndpoint : public EndpointI
 {
 public:

data/ext/ice/cpp/src/Ice/WSTransceiver.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -223,7 +223,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
             //
             // We don't know how much we'll need to read.
             //
-            _readBuffer.b.resize(1024);
+            _readBuffer.b.resize(_readBufferSize);
             _readI = _readBuffer.i = _readBuffer.b.begin();
 
             //
@@ -513,7 +513,7 @@ IceInternal::WSTransceiver::write(Buffer& buf)
                 {
                     return s;
                 }
-            } 
+            }
             else if(_incoming && !buf.b.empty() && _writeState == WriteStatePayload)
             {
                 SocketOperation s = _delegate->write(buf);
@@ -803,14 +803,8 @@ IceInternal::WSTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::WSTransceiver::getInfo() const
 {
-    IPConnectionInfoPtr di = IPConnectionInfoPtr::dynamicCast(_delegate->getInfo());
-    assert(di);
-    WSConnectionInfoPtr info = new WSConnectionInfo();
-    info->localAddress = di->localAddress;
-    info->localPort = di->localPort;
-    info->remoteAddress = di->remoteAddress;
-    info->remotePort = di->remotePort;
-    return info;
+    assert(dynamic_cast<WSTransceiverDelegate*>(_delegate.get()));
+    return dynamic_cast<WSTransceiverDelegate*>(_delegate.get())->getWSInfo(_parser->getHeaders());
 }
 
 void
@@ -819,8 +813,14 @@ IceInternal::WSTransceiver::checkSendSize(const Buffer& buf)
     _delegate->checkSendSize(buf);
 }
 
+void
+IceInternal::WSTransceiver::setBufferSize(int rcvSize, int sndSize)
+{
+    _delegate->setBufferSize(rcvSize, sndSize);
+}
+
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del,
-                                            const string& host, int port, const string& resource) :
+                                          const string& host, int port, const string& resource) :
     _instance(instance),
     _delegate(del),
     _host(host),
@@ -836,24 +836,19 @@ IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, c
     _readHeaderLength(0),
     _readPayloadLength(0),
     _writeState(WriteStateHeader),
-    _writeBufferSize(1024),
+    _writeBufferSize(16 * 1024),
     _readPending(false),
     _writePending(false),
     _closingInitiator(false),
     _closingReason(CLOSURE_NORMAL)
 {
     //
-    // For client connections, the sent frame payload must be
-    // masked. So we copy and send the message buffer data in chuncks
-    // of data whose size is up to the write buffer size.
-    //
-    const_cast<size_t&>(_writeBufferSize) = max(IceInternal::getSendBufferSize(del->getNativeInfo()->fd()), 1024);
-
+    // Use 1KB read and 16KB write buffer sizes. We use 16KB for the
+    // write buffer size because all the data needs to be copied to
+    // the write buffer for the purpose of masking. A 16KB buffer
+    // appears to be a good compromise to reduce the number of socket
+    // write calls and not consume too much memory.
     //
-    // Write and read buffer size must be large enough to hold the frame header!
-    //
-    assert(_writeBufferSize > 256);
-    assert(_readBufferSize > 256);
 }
 
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del) :
@@ -877,10 +872,8 @@ IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, c
     _closingReason(CLOSURE_NORMAL)
 {
     //
-    // Write and read buffer size must be large enough to hold the frame header!
+    // Use 1KB read and write buffer sizes.
     //
-    assert(_writeBufferSize > 256);
-    assert(_readBufferSize > 256);
 }
 
 IceInternal::WSTransceiver::~WSTransceiver()
@@ -1007,7 +1000,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     out << "Sec-WebSocket-Accept: ";
     string input = key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtil::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     out << IceInternal::Base64::encode(hash) << "\r\n" << "\r\n"; // EOM
 
     string str = out.str();
@@ -1105,7 +1098,7 @@ IceInternal::WSTransceiver::handleResponse()
     }
     string input = _key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtil::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     if(val != IceInternal::Base64::encode(hash))
     {
         throw WebSocketException("invalid value `" + val + "' for Sec-WebSocket-Accept");
@@ -1377,19 +1370,23 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 return false;
             }
 
-            if(_readI < _readBuffer.i)
+            size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
+
+            if(n > _readPayloadLength)
+            {
+                n = _readPayloadLength;
+            }
+            if(n > 0)
             {
-                size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
                 memcpy(buf.i, _readI, n);
                 buf.i += n;
                 _readI += n;
             }
-
             //
             // Continue reading if we didn't read the full message, otherwise give back
             // the control to the connection
             //
-            return buf.i < buf.b.end();
+            return buf.i < buf.b.end() && n < _readPayloadLength;
         }
     }
 }
@@ -1510,7 +1507,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         // For an outgoing connection, each message must be masked with a random
         // 32-bit value, so we copy the entire message into the internal buffer
         // for writing. For incoming connections, we just copy the start of the
-        // message in the internal buffer after the hedaer. If the message is 
+        // message in the internal buffer after the hedaer. If the message is
         // larger, the reminder is sent directly from the message buffer to avoid
         // copying.
         //
@@ -1521,7 +1518,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             {
                 _writeBuffer.i = _writeBuffer.b.begin();
             }
-            
+
             size_t n = buf.i - buf.b.begin();
             for(; n < buf.b.size() && _writeBuffer.i < _writeBuffer.b.end(); ++_writeBuffer.i, ++n)
             {
@@ -1725,4 +1722,3 @@ IceInternal::WSTransceiver::prepareWriteHeader(Byte opCode, IceInternal::Buffer:
         _writeBuffer.i += sizeof(_writeMask);
     }
 }
-

data/ext/ice/cpp/src/Ice/WSTransceiver.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -24,6 +24,17 @@ namespace IceInternal
 class ConnectorI;
 class AcceptorI;
 
+//
+// Delegate interface implemented by TcpTransceiver or IceSSL::Transceiver or any transport that WS can
+// delegate to.
+//
+class ICE_API WSTransceiverDelegate : virtual public IceUtil::Shared
+{
+public:
+
+    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const = 0;
+};
+
 class WSTransceiver : public Transceiver
 {
 public:
@@ -51,6 +62,7 @@ public:
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
     virtual void checkSendSize(const Buffer&);
+    virtual void setBufferSize(int rcvSize, int sndSize);
 
 private:
 

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -29,8 +29,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -65,14 +71,14 @@ void
 }
 
 void
-IceProxy::IceDiscovery::LookupReply::foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context* __ctx)
+IceProxy::IceDiscovery::LookupReply::foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __IceDiscovery__LookupReply__foundObjectById_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(prx);
+        __os->write(__p_id);
+        __os->write(__p_prx);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -83,15 +89,15 @@ IceProxy::IceDiscovery::LookupReply::foundObjectById(const ::Ice::Identity& id,
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::LookupReply::begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::LookupReply::begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__LookupReply__foundObjectById_name, __del, __cookie);
     try
     {
         __result->prepare(__IceDiscovery__LookupReply__foundObjectById_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(prx);
+        __os->write(__p_id);
+        __os->write(__p_prx);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -109,15 +115,15 @@ IceProxy::IceDiscovery::LookupReply::end_foundObjectById(const ::Ice::AsyncResul
 }
 
 void
-IceProxy::IceDiscovery::LookupReply::foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context* __ctx)
+IceProxy::IceDiscovery::LookupReply::foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __IceDiscovery__LookupReply__foundAdapterById_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(prx);
-        __os->write(isReplicaGroup);
+        __os->write(__p_id);
+        __os->write(__p_prx);
+        __os->write(__p_isReplicaGroup);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -128,16 +134,16 @@ IceProxy::IceDiscovery::LookupReply::foundAdapterById(const ::std::string& id, c
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::LookupReply::begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::LookupReply::begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__LookupReply__foundAdapterById_name, __del, __cookie);
     try
     {
         __result->prepare(__IceDiscovery__LookupReply__foundAdapterById_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(prx);
-        __os->write(isReplicaGroup);
+        __os->write(__p_id);
+        __os->write(__p_prx);
+        __os->write(__p_isReplicaGroup);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -184,15 +190,15 @@ void
 }
 
 void
-IceProxy::IceDiscovery::Lookup::findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context* __ctx)
+IceProxy::IceDiscovery::Lookup::findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __IceDiscovery__Lookup__findObjectById_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(domainId);
-        __os->write(id);
-        __os->write(reply);
+        __os->write(__p_domainId);
+        __os->write(__p_id);
+        __os->write(__p_reply);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -203,16 +209,16 @@ IceProxy::IceDiscovery::Lookup::findObjectById(const ::std::string& domainId, co
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::Lookup::begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::Lookup::begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__Lookup__findObjectById_name, __del, __cookie);
     try
     {
         __result->prepare(__IceDiscovery__Lookup__findObjectById_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(domainId);
-        __os->write(id);
-        __os->write(reply);
+        __os->write(__p_domainId);
+        __os->write(__p_id);
+        __os->write(__p_reply);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -230,15 +236,15 @@ IceProxy::IceDiscovery::Lookup::end_findObjectById(const ::Ice::AsyncResultPtr&
 }
 
 void
-IceProxy::IceDiscovery::Lookup::findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context* __ctx)
+IceProxy::IceDiscovery::Lookup::findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __IceDiscovery__Lookup__findAdapterById_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(domainId);
-        __os->write(id);
-        __os->write(reply);
+        __os->write(__p_domainId);
+        __os->write(__p_id);
+        __os->write(__p_reply);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -249,16 +255,16 @@ IceProxy::IceDiscovery::Lookup::findAdapterById(const ::std::string& domainId, c
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::Lookup::begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::Lookup::begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__Lookup__findAdapterById_name, __del, __cookie);
     try
     {
         __result->prepare(__IceDiscovery__Lookup__findAdapterById_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(domainId);
-        __os->write(id);
-        __os->write(reply);
+        __os->write(__p_domainId);
+        __os->write(__p_id);
+        __os->write(__p_reply);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -333,12 +339,12 @@ IceDiscovery::LookupReply::___foundObjectById(::IceInternal::Incoming& __inS, co
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::Identity id;
-    ::Ice::ObjectPrx prx;
-    __is->read(id);
-    __is->read(prx);
+    ::Ice::Identity __p_id;
+    ::Ice::ObjectPrx __p_prx;
+    __is->read(__p_id);
+    __is->read(__p_prx);
     __inS.endReadParams();
-    foundObjectById(id, prx, __current);
+    foundObjectById(__p_id, __p_prx, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -348,14 +354,14 @@ IceDiscovery::LookupReply::___foundAdapterById(::IceInternal::Incoming& __inS, c
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string id;
-    ::Ice::ObjectPrx prx;
-    bool isReplicaGroup;
-    __is->read(id);
-    __is->read(prx);
-    __is->read(isReplicaGroup);
+    ::std::string __p_id;
+    ::Ice::ObjectPrx __p_prx;
+    bool __p_isReplicaGroup;
+    __is->read(__p_id);
+    __is->read(__p_prx);
+    __is->read(__p_isReplicaGroup);
     __inS.endReadParams();
-    foundAdapterById(id, prx, isReplicaGroup, __current);
+    foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -485,14 +491,14 @@ IceDiscovery::Lookup::___findObjectById(::IceInternal::Incoming& __inS, const ::
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string domainId;
-    ::Ice::Identity id;
-    ::IceDiscovery::LookupReplyPrx reply;
-    __is->read(domainId);
-    __is->read(id);
-    __is->read(reply);
+    ::std::string __p_domainId;
+    ::Ice::Identity __p_id;
+    ::IceDiscovery::LookupReplyPrx __p_reply;
+    __is->read(__p_domainId);
+    __is->read(__p_id);
+    __is->read(__p_reply);
     __inS.endReadParams();
-    findObjectById(domainId, id, reply, __current);
+    findObjectById(__p_domainId, __p_id, __p_reply, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -502,14 +508,14 @@ IceDiscovery::Lookup::___findAdapterById(::IceInternal::Incoming& __inS, const :
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string domainId;
-    ::std::string id;
-    ::IceDiscovery::LookupReplyPrx reply;
-    __is->read(domainId);
-    __is->read(id);
-    __is->read(reply);
+    ::std::string __p_domainId;
+    ::std::string __p_id;
+    ::IceDiscovery::LookupReplyPrx __p_reply;
+    __is->read(__p_domainId);
+    __is->read(__p_id);
+    __is->read(__p_reply);
     __inS.endReadParams();
-    findAdapterById(domainId, id, reply, __current);
+    findAdapterById(__p_domainId, __p_id, __p_reply, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }