zeroc-ice 3.8.2 → 3.8.3

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

@@ -52,6 +52,23 @@ namespace
     const string _iceProtocol = "ice.zeroc.com";                   // NOLINT(cert-err58-cpp)
     const string _wsUUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; // NOLINT(cert-err58-cpp)
 
+    // Returns true if the Connection header field - a comma-separated list of tokens, already trimmed and lowercased
+    // by HttpParser::getHeader - includes the "upgrade" token required by RFC 6455 section 4.
+    bool hasUpgradeToken(string_view connectionField)
+    {
+        while (!connectionField.empty())
+        {
+            auto comma = connectionField.find(',');
+            string_view token = connectionField.substr(0, comma);
+            connectionField.remove_prefix(comma == string_view::npos ? connectionField.size() : comma + 1);
+            if (IceInternal::trim(token) == "upgrade")
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     //
     // Rename to avoid conflict with OS 10.10 htonll
     //
@@ -232,7 +249,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
                 // encoded with Base64.
                 //
                 vector<byte> key(16);
-                IceInternal::generateRandom(reinterpret_cast<char*>(&key[0]), key.size());
+                IceInternal::generateRandom(reinterpret_cast<char*>(key.data()), key.size());
                 _key = IceInternal::Base64::encode(key);
                 out << _key << "\r\n\r\n"; // EOM
 
@@ -420,10 +437,10 @@ IceInternal::WSTransceiver::closing(bool initiator, exception_ptr reason)
     {
         //
         // If we initiated a close connection but also received a
-        // close connection, we assume we didn't initiated the
-        // connection and we send the close frame now. This is to
+        // close connection, we assume we didn't initiate the
+        // close and we send the close frame now. This is to
         // ensure that if both peers close the connection at the same
-        // time we don't hang having both peer waiting for the close
+        // time we don't hang having both peers waiting for the close
         // frame of the other.
         //
         assert(!initiator);
@@ -575,8 +592,8 @@ IceInternal::WSTransceiver::read(Buffer& buf)
     }
 
     //
-    // If we read the full Ice message, handle it before trying
-    // reading anymore data from the WS connection.
+    // If we read the full Ice message, handle it before trying to
+    // read any more data from the WS connection.
     //
     if (buf.i == buf.b.end())
     {
@@ -921,6 +938,19 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
 {
     string val;
 
+    //
+    // The opening handshake must be a GET request (RFC 6455 section 4.1). We check the message type first
+    // because method() (used just below) and uri() (used later) assert the parser holds a request.
+    //
+    if (_parser->type() != HttpParser::TypeRequest)
+    {
+        throw WebSocketException("WebSocket handshake is not an HTTP request");
+    }
+    if (_parser->method() != "GET")
+    {
+        throw WebSocketException("unsupported HTTP method '" + _parser->method() + "' for WebSocket handshake");
+    }
+
     //
     // HTTP/1.1
     //
@@ -950,7 +980,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     {
         throw WebSocketException("missing value for Connection field");
     }
-    else if (val.find("upgrade") == string::npos)
+    else if (!hasUpgradeToken(val))
     {
         throw WebSocketException("invalid value '" + val + "' for Connection field");
     }
@@ -1000,10 +1030,17 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
         throw WebSocketException("missing value for WebSocket key");
     }
 
-    vector<byte> decodedKey = Base64::decode(key);
-    if (decodedKey.size() != 16)
+    try
+    {
+        vector<byte> decodedKey = Base64::decode(key);
+        if (decodedKey.size() != 16)
+        {
+            throw WebSocketException("WebSocket key '" + key + "' has invalid length");
+        }
+    }
+    catch (const std::invalid_argument&)
     {
-        throw WebSocketException("invalid value '" + key + "' for WebSocket key");
+        throw WebSocketException("invalid base64 value '" + key + "' for WebSocket key");
     }
 
     //
@@ -1062,9 +1099,8 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     out << "Sec-WebSocket-Accept: ";
     string input = key + _wsUUID;
     vector<byte> hash;
-    sha1(reinterpret_cast<const byte*>(&input[0]), input.size(), hash);
-    out << IceInternal::Base64::encode(hash) << "\r\n"
-        << "\r\n"; // EOM
+    sha1(reinterpret_cast<const byte*>(input.data()), input.size(), hash);
+    out << IceInternal::Base64::encode(hash) << "\r\n\r\n"; // EOM
 
     string str = out.str();
     responseBuffer.b.resize(str.size());
@@ -1129,7 +1165,7 @@ IceInternal::WSTransceiver::handleResponse()
     {
         throw WebSocketException("missing value for Connection field");
     }
-    else if (val.find("upgrade") == string::npos)
+    else if (!hasUpgradeToken(val))
     {
         throw WebSocketException("invalid value '" + val + "' for Connection field");
     }
@@ -1161,7 +1197,7 @@ IceInternal::WSTransceiver::handleResponse()
     }
     string input = _key + _wsUUID;
     vector<byte> hash;
-    sha1(reinterpret_cast<const byte*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const byte*>(input.data()), input.size(), hash);
     if (val != IceInternal::Base64::encode(hash))
     {
         throw WebSocketException("invalid value '" + val + "' for Sec-WebSocket-Accept");
@@ -1352,7 +1388,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                     }
                     _readState = ReadStatePayload;
                     assert(buf.i != buf.b.end());
-                    _readFrameStart = buf.i;
+                    _readFrameOffset = 0;
                     break;
                 }
                 case OP_CLOSE: // Connection close
@@ -1430,7 +1466,17 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
             {
                 _pingPayload.clear();
                 _pingPayload.resize(_readPayloadLength);
-                memcpy(&_pingPayload[0], _readI, _pingPayload.size());
+                memcpy(_pingPayload.data(), _readI, _pingPayload.size());
+                if (_incoming)
+                {
+                    // A client masks its frames (RFC 6455 §5.3), so unmask the ping payload here, just like the
+                    // data path does in postRead. Otherwise the pong we echo back carries the still-masked bytes
+                    // instead of the original ping payload (RFC 6455 §5.5.3).
+                    for (size_t i = 0; i < _pingPayload.size(); ++i)
+                    {
+                        _pingPayload[i] ^= static_cast<uint8_t>(_readMask[i % 4]);
+                    }
+                }
             }
 
             _readI += _readPayloadLength;
@@ -1506,13 +1552,16 @@ IceInternal::WSTransceiver::postRead(Buffer& buf)
     if (_incoming)
     {
         //
-        // Unmask the data we just read.
+        // Unmask the data we just read. _readFrameOffset is the mask index (payload bytes consumed so far in
+        // this frame). We keep it as an integer rather than an iterator into buf because ConnectionI reallocates
+        // the read buffer between reads of the same frame, which would invalidate such an iterator.
         //
         IceInternal::Buffer::Container::iterator p = _readStart;
-        for (auto n = static_cast<size_t>(_readStart - _readFrameStart); p < buf.i; ++p, ++n)
+        for (size_t n = _readFrameOffset; p < buf.i; ++p, ++n)
         {
             *p ^= _readMask[n % 4];
         }
+        _readFrameOffset += static_cast<size_t>(buf.i - _readStart);
     }
 
     _readPayloadLength -= static_cast<size_t>(buf.i - _readStart);
@@ -1555,15 +1604,35 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         else if (_state == StatePongPending)
         {
             prepareWriteHeader(OP_PONG, _pingPayload.size());
-            if (_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
+
+            // A zero-length ping (the common keep-alive case) leaves _pingPayload empty. Guard the copy so we
+            // never form &_pingPayload[0] on an empty vector, which is undefined behavior and aborts under
+            // hardened standard libraries (_GLIBCXX_ASSERTIONS, MSVC debug iterators, libc++ hardening).
+            if (!_pingPayload.empty())
             {
-                auto pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
-                _writeBuffer.b.resize(pos + _pingPayload.size());
-                _writeBuffer.i = _writeBuffer.b.begin() + pos;
+                if (_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
+                {
+                    auto pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
+                    _writeBuffer.b.resize(pos + _pingPayload.size());
+                    _writeBuffer.i = _writeBuffer.b.begin() + pos;
+                }
+                if (_incoming)
+                {
+                    // Server-to-client frames are not masked (RFC 6455 §5.1).
+                    memcpy(_writeBuffer.i, _pingPayload.data(), _pingPayload.size());
+                    _writeBuffer.i += _pingPayload.size();
+                }
+                else
+                {
+                    // Client-to-server frames are masked with _writeMask, like the OP_DATA and OP_CLOSE paths;
+                    // prepareWriteHeader set FLAG_MASKED, so the payload must be masked to match (RFC 6455 §5.5.3).
+                    for (size_t i = 0; i < _pingPayload.size(); ++i)
+                    {
+                        *_writeBuffer.i++ = static_cast<std::byte>(_pingPayload[i]) ^ _writeMask[i % 4];
+                    }
+                }
+                _pingPayload.clear();
             }
-            memcpy(_writeBuffer.i, &_pingPayload[0], _pingPayload.size());
-            _writeBuffer.i += _pingPayload.size();
-            _pingPayload.clear();
 
             _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
@@ -1608,7 +1677,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         // 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 header. If the message is
-        // larger, the reminder is sent directly from the message buffer to avoid
+        // larger, the remainder is sent directly from the message buffer to avoid
         // copying.
         //
 

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

@@ -117,7 +117,7 @@ namespace IceInternal
         size_t _readHeaderLength;
         size_t _readPayloadLength;
         Buffer::Container::iterator _readStart;
-        Buffer::Container::iterator _readFrameStart;
+        size_t _readFrameOffset{0};
         std::byte _readMask[4];
 
         enum WriteState

data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Context.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Identity.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Locator.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Metrics.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'OperationMode.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Process.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Process.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'PropertiesAdmin.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'PropertyDict.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/RemoteLogger.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'RemoteLogger.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/ReplyStatus.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'ReplyStatus.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Router.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/SliceChecksumDict.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'SliceChecksumDict.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Version.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.2
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Version.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp

@@ -30,6 +30,7 @@ IceDiscovery::Request::retry()
 void
 IceDiscovery::Request::invoke(const string& domainId, const vector<pair<LookupPrx, LookupReplyPrx>>& lookups)
 {
+    ++_generation;
     _lookupCount = lookups.size();
     _failureCount = 0;
     Ice::Identity id;
@@ -42,8 +43,15 @@ IceDiscovery::Request::invoke(const string& domainId, const vector<pair<LookupPr
 }
 
 bool
-IceDiscovery::Request::exception()
+IceDiscovery::Request::exception(size_t generation)
 {
+    // Ignore a delayed failure from an earlier invocation round: it must not count against the current round, which
+    // reset _failureCount and may still have outstanding lookups.
+    if (generation != _generation)
+    {
+        return false;
+    }
+
     // If all the invocations on all the lookup proxies failed, report it to the locator.
     if (++_failureCount == _lookupCount)
     {
@@ -69,7 +77,17 @@ AdapterRequest::AdapterRequest(const LookupIPtr& lookup, const std::string& adap
 bool
 AdapterRequest::retry()
 {
-    return _proxies.empty() && --_retryCount >= 0;
+    if (_proxies.empty() && --_retryCount >= 0)
+    {
+        // We only reach here with _proxies empty, i.e. no replica-group response arrived. _latency is set only
+        // together with inserting into _proxies, so the latency timer is not running.
+        assert(_latency == chrono::nanoseconds::zero());
+
+        // Restart the replica-group latency window so it's measured from this round rather than from request creation.
+        _start = chrono::steady_clock::now();
+        return true;
+    }
+    return false;
 }
 
 bool
@@ -77,6 +95,7 @@ AdapterRequest::response(const ObjectPrx& proxy, bool isReplicaGroup)
 {
     if (isReplicaGroup)
     {
+        _proxies.insert(proxy);
         if (_latency == chrono::nanoseconds::zero())
         {
             _latency = chrono::duration_cast<chrono::nanoseconds>(chrono::steady_clock::now() - _start) *
@@ -84,7 +103,6 @@ AdapterRequest::response(const ObjectPrx& proxy, bool isReplicaGroup)
             _lookup->timer()->cancel(shared_from_this());
             _lookup->timer()->schedule(shared_from_this(), _latency);
         }
-        _proxies.insert(proxy);
         return false;
     }
     finished(proxy);
@@ -127,7 +145,8 @@ AdapterRequest::invokeWithLookup(const string& domainId, const LookupPrx& lookup
         _id,
         lookupReply,
         nullptr,
-        [self = shared_from_this()](exception_ptr ex) { self->_lookup->adapterRequestException(self, ex); });
+        [self = shared_from_this(), generation = _generation](exception_ptr ex)
+        { self->_lookup->adapterRequestException(self, ex, generation); });
 }
 
 void
@@ -155,7 +174,8 @@ ObjectRequest::invokeWithLookup(const string& domainId, const LookupPrx& lookup,
         _id,
         lookupReply,
         nullptr,
-        [self = shared_from_this()](exception_ptr ex) { self->_lookup->objectRequestException(self, ex); });
+        [self = shared_from_this(), generation = _generation](exception_ptr ex)
+        { self->_lookup->objectRequestException(self, ex, generation); });
 }
 
 void
@@ -173,6 +193,24 @@ LookupI::LookupI(LocatorRegistryIPtr registry, const LookupPrx& lookup, const Ic
       _domainId(properties->getIceProperty("IceDiscovery.DomainId")),
       _timer(IceInternal::getInstanceTimer(lookup->ice_getCommunicator()))
 {
+    if (_timeout <= chrono::milliseconds::zero())
+    {
+        throw PropertyException{__FILE__, __LINE__, "property 'IceDiscovery.Timeout' must be greater than 0"};
+    }
+    if (_retryCount < 0)
+    {
+        throw PropertyException{
+            __FILE__,
+            __LINE__,
+            "property 'IceDiscovery.RetryCount' must be greater than or equal to 0"};
+    }
+    if (_latencyMultiplier < 1)
+    {
+        throw PropertyException{
+            __FILE__,
+            __LINE__,
+            "property 'IceDiscovery.LatencyMultiplier' must be greater than or equal to 1"};
+    }
 }
 
 void
@@ -390,7 +428,7 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request)
 }
 
 void
-LookupI::adapterRequestException(const AdapterRequestPtr& request, exception_ptr ex)
+LookupI::adapterRequestException(const AdapterRequestPtr& request, exception_ptr ex, size_t generation)
 {
     lock_guard lock(_mutex);
     auto p = _adapterRequests.find(request->getId());
@@ -399,7 +437,7 @@ LookupI::adapterRequestException(const AdapterRequestPtr& request, exception_ptr
         return;
     }
 
-    if (request->exception())
+    if (request->exception(generation))
     {
         if (_warnOnce)
         {
@@ -448,7 +486,7 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
 }
 
 void
-LookupI::objectRequestException(const ObjectRequestPtr& request, exception_ptr ex)
+LookupI::objectRequestException(const ObjectRequestPtr& request, exception_ptr ex, size_t generation)
 {
     lock_guard lock(_mutex);
     auto p = _objectRequests.find(request->getId());
@@ -457,7 +495,7 @@ LookupI::objectRequestException(const ObjectRequestPtr& request, exception_ptr e
         return;
     }
 
-    if (request->exception())
+    if (request->exception(generation))
     {
         if (_warnOnce)
         {