zeroc-ice 3.8.1 → 3.8.2

data/dist/ice/cpp/src/Slice/Preprocessor.cpp

@@ -9,21 +9,80 @@
 #include "Util.h"
 #include <algorithm>
 #include <cassert>
+#include <cerrno>
 #include <cstring>
+#include <fcntl.h>
 #include <fstream>
 #include <iterator>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <vector>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#    include <io.h>
+#    include <share.h>
+#else
 #    include <sys/wait.h>
+#    include <unistd.h>
 #endif
 
 using namespace std;
 using namespace Slice;
 using namespace IceInternal;
 
+namespace
+{
+    // Atomically create and open a new file for read/write, failing if the file already exists or, on POSIX, if the
+    // path resolves to a symlink. This avoids the TOCTOU race that a name-then-open sequence would otherwise expose
+    // to a local attacker who could plant a symlink at the generated path.
+#ifdef _WIN32
+    FILE* openExclusive(const wchar_t* path)
+    {
+        int fd = -1;
+        // _O_TEMPORARY tells the CRT to delete the file when the last file descriptor is closed -- this avoids the
+        // need for a separate, racy unlink-by-name in close().
+        if (::_wsopen_s(
+                &fd,
+                path,
+                _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY | _O_TEMPORARY,
+                _SH_DENYRW,
+                _S_IREAD | _S_IWRITE) != 0)
+        {
+            return nullptr;
+        }
+        FILE* fp = ::_fdopen(fd, "w+");
+        if (!fp)
+        {
+            ::_close(fd);
+        }
+        return fp;
+    }
+#else
+    FILE* openExclusive(const char* path)
+    {
+        int fd = ::open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, S_IRUSR | S_IWUSR);
+        if (fd == -1)
+        {
+            return nullptr;
+        }
+        // Unlink immediately so the file is anonymous: the inode survives via our descriptor and the kernel
+        // releases it on close. ENOENT means another process already removed the entry, leaving us in the same
+        // state; any other unlink error is fatal because the caller has no path to retry cleanup.
+        if (::unlink(path) != 0 && errno != ENOENT)
+        {
+            ::close(fd);
+            return nullptr;
+        }
+        FILE* fp = ::fdopen(fd, "w+");
+        if (!fp)
+        {
+            ::close(fd);
+        }
+        return fp;
+    }
+#endif
+}
+
 //
 // mcpp defines
 //
@@ -201,32 +260,32 @@ Slice::Preprocessor::preprocess(const string& languageArg)
         //
 #ifdef _WIN32
         //
-        // We use an unique id as the tmp file name prefix to avoid
-        // problems with this code being called concurrently from
-        // several processes, otherwise there is a change that two
-        // process call _tempnam before any of them call fopen and
-        // they will end up using the same tmp file.
+        // We use an unique id as the tmp file name prefix to avoid problems with this code being called concurrently
+        // from several processes, otherwise there is a chance that two processes call _wtempnam before any of them
+        // opens the file and they will end up using the same tmp file. We then open the file with O_EXCL to atomically
+        // create it -- this closes the TOCTOU window between _wtempnam returning a name and our opening it. The
+        // _O_TEMPORARY flag inside openExclusive causes the file to be deleted automatically when the descriptor is
+        // closed, so we don't need to retain the path past this point.
         //
         wchar_t* name = _wtempnam(0, Ice::stringToWstring("slice-" + Ice::generateUUID()).c_str());
         if (name)
         {
-            _cppFile = Ice::wstringToString(name);
+            _cppHandle = openExclusive(name);
             free(name);
-            _cppHandle = IceInternal::fopen(_cppFile, "w+");
         }
 #else
         _cppHandle = tmpfile();
 #endif
 
-        // If that fails try to open file in current directory.
+        // If that fails try to open file in current directory. openExclusive immediately unlinks the file on POSIX
+        // and sets _O_TEMPORARY on Windows, so the path is only used during the open attempt.
         if (_cppHandle == nullptr)
         {
 #ifdef _WIN32
-            _cppFile = "slice-" + Ice::generateUUID();
+            _cppHandle = openExclusive(Ice::stringToWstring("slice-" + Ice::generateUUID()).c_str());
 #else
-            _cppFile = ".slice-" + Ice::generateUUID();
+            _cppHandle = openExclusive((".slice-" + Ice::generateUUID()).c_str());
 #endif
-            _cppHandle = IceInternal::fopen(_cppFile, "w+");
         }
 
         if (_cppHandle != nullptr)
@@ -241,7 +300,7 @@ Slice::Preprocessor::preprocess(const string& languageArg)
         {
             // Calling this again causes the memory buffers to be freed.
             mcpp_use_mem_buffers(1);
-            throw runtime_error(_path + ": error: could not open temporary file: " + _cppFile);
+            throw runtime_error(_path + ": error: could not open temporary file for preprocessor output");
         }
     }
 
@@ -256,14 +315,11 @@ Slice::Preprocessor::close()
 {
     if (_cppHandle != nullptr)
     {
+        // The temp file deletes itself when the descriptor is closed. On POSIX, tmpfile() returns an
+        // already-unlinked file and the CWD fallback unlinks after open; on Windows, openExclusive opens
+        // with _O_TEMPORARY. fclose is the only cleanup needed.
         int status = fclose(_cppHandle);
         _cppHandle = nullptr;
-
-        if (_cppFile.size() != 0)
-        {
-            IceInternal::unlink(_cppFile);
-        }
-
         if (status != 0)
         {
             throw runtime_error("failed to close preprocessor file: " + IceInternal::lastErrorToString());

data/dist/ice/cpp/src/Slice/Preprocessor.h

@@ -36,7 +36,6 @@ namespace Slice
         const std::string _fileName;
         const std::string _shortFileName;
         const std::vector<std::string> _args;
-        std::string _cppFile;
         FILE* _cppHandle{nullptr};
     };
 }

data/dist/ice/cpp/src/Slice/SliceUtil.cpp

@@ -489,7 +489,7 @@ Slice::getArticleFor(const string& s)
     return (vowels.find_first_of(s[0]) != string::npos) ? "an" : "a";
 }
 
-std::string
+string
 Slice::pluralKindOf(const ContainedPtr& p)
 {
     string kindOf = p->kindOf();
@@ -507,58 +507,6 @@ Slice::pluralKindOf(const ContainedPtr& p)
     }
 }
 
-bool
-Slice::reportIllegalSuffixOrUnderscore(const string& identifier)
-{
-    // check whether the identifier is scoped
-    size_t scopeIndex = identifier.rfind("::");
-    bool isScoped = scopeIndex != string::npos;
-    string name;
-    if (isScoped)
-    {
-        name = identifier.substr(scopeIndex + 2); // Only check the unscoped identifier for syntax
-    }
-    else
-    {
-        name = identifier;
-    }
-
-    assert(!name.empty());
-    bool isValid = true;
-
-    // check the identifier for reserved suffixes
-    static const string suffixBlacklist[] = {"Helper", "Holder", "Prx", "Ptr"};
-    for (const auto& i : suffixBlacklist)
-    {
-        if (name.find(i, name.size() - i.size()) != string::npos)
-        {
-            currentUnit->error("illegal identifier '" + name + "': '" + i + "' suffix is reserved");
-            isValid = false;
-            break;
-        }
-    }
-
-    // check the identifier for illegal underscores
-    size_t index = name.find('_');
-    if (index == 0)
-    {
-        currentUnit->error("illegal leading underscore in identifier '" + name + "'");
-        isValid = false;
-    }
-    else if (name.rfind('_') == (name.size() - 1))
-    {
-        currentUnit->error("illegal trailing underscore in identifier '" + name + "'");
-        isValid = false;
-    }
-    else if (name.find("__") != string::npos)
-    {
-        currentUnit->error("illegal double underscore in identifier '" + name + "'");
-        isValid = false;
-    }
-
-    return isValid;
-}
-
 bool
 Slice::isProxyType(const TypePtr& type)
 {
@@ -635,7 +583,7 @@ Slice::getFirstSentence(const StringList& lines)
 }
 
 string
-Slice::getEscapedParamName(const ParameterList& params, std::string_view param)
+Slice::getEscapedParamName(const ParameterList& params, string_view param)
 {
     for (const auto& p : params)
     {
@@ -650,14 +598,14 @@ Slice::getEscapedParamName(const ParameterList& params, std::string_view param)
 string
 Slice::getTypeScopedName(const TypePtr& type)
 {
-    if (auto builtin = std::dynamic_pointer_cast<Builtin>(type))
+    if (auto builtin = dynamic_pointer_cast<Builtin>(type))
     {
         return builtin->kindAsString();
     }
     else
     {
         // a type is either built-in or contained
-        auto contained = std::dynamic_pointer_cast<Contained>(type);
+        auto contained = dynamic_pointer_cast<Contained>(type);
         assert(contained);
         return contained->scoped();
     }
@@ -755,7 +703,7 @@ Slice::DependencyGenerator::writeMakefileDependencies(
 }
 
 void
-Slice::DependencyGenerator::writeXMLDependencies(const std::string& dependFile)
+Slice::DependencyGenerator::writeXMLDependencies(const string& dependFile)
 {
     ostringstream os;
     os << R"(<?xml version="1.0" encoding="UTF-8"?>)";
@@ -777,7 +725,7 @@ Slice::DependencyGenerator::writeXMLDependencies(const std::string& dependFile)
 }
 
 void
-Slice::DependencyGenerator::writeJSONDependencies(const std::string& dependFile)
+Slice::DependencyGenerator::writeJSONDependencies(const string& dependFile)
 {
     ostringstream os;
     os << "{";

data/dist/ice/cpp/src/Slice/Util.h

@@ -70,9 +70,6 @@ namespace Slice
     /// @see Contained::kindOf
     std::string pluralKindOf(const ContainedPtr& p);
 
-    // Checks an identifier for illegal syntax and reports any errors that are present.
-    bool reportIllegalSuffixOrUnderscore(const std::string& identifier);
-
     bool isProxyType(const TypePtr& type);
 
     // Is this the first element defined in its container?

data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp

@@ -241,13 +241,14 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     }
     for (auto q = members.begin(); q != members.end(); ++q)
     {
+        const bool isOptional = (*q)->isOptional();
         if (q != members.begin())
         {
             _out << ',' << nl;
         }
         _out << "['" << getMappedName(*q) << "', ";
         writeType((*q)->type());
-        _out << ", " << ((*q)->optional() ? "true" : "false") << ", " << ((*q)->optional() ? (*q)->tag() : 0) << ']';
+        _out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? (*q)->tag() : 0) << ']';
     }
     if (members.size() > 1)
     {
@@ -407,6 +408,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
         bool isFirst = true;
         for (const auto& param : op->inParameters())
         {
+            const bool isOptional = param->isOptional();
             if (!isFirst)
             {
                 _out << ", ";
@@ -414,13 +416,13 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
             isFirst = false;
             _out << '[';
             writeType(param->type());
-            _out << ", " << (param->optional() ? "true" : "false") << ", " << (param->optional() ? param->tag() : 0)
-                 << ']';
+            _out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? param->tag() : 0) << ']';
         }
         _out << "], [";
         isFirst = true;
         for (const auto& param : op->outParameters())
         {
+            const bool isOptional = param->isOptional();
             if (!isFirst)
             {
                 _out << ", ";
@@ -428,8 +430,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
             isFirst = false;
             _out << '[';
             writeType(param->type());
-            _out << ", " << (param->optional() ? "true" : "false") << ", " << (param->optional() ? param->tag() : 0)
-                 << ']';
+            _out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? param->tag() : 0) << ']';
         }
         _out << "], ";
         TypePtr returnType = op->returnType();
@@ -456,6 +457,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
             _out << getMetaTypeReference(ex);
         }
         _out.epar("]");
+        _out << ", " << (op->hasMetadata("oneway") ? "true" : "false");
         _out << ")";
 
         if (op->isDeprecated())
@@ -547,14 +549,14 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     //
     for (auto dmli = members.begin(); dmli != members.end(); ++dmli)
     {
+        const bool isOptional = (*dmli)->isOptional();
         if (dmli != members.begin())
         {
             _out << ',' << nl;
         }
         _out << "[\"" << getMappedName(*dmli) << "\", ";
         writeType((*dmli)->type());
-        _out << ", " << ((*dmli)->optional() ? "true" : "false") << ", " << ((*dmli)->optional() ? (*dmli)->tag() : 0)
-             << ']';
+        _out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? (*dmli)->tag() : 0) << ']';
     }
     if (members.size() > 1)
     {
@@ -1038,7 +1040,7 @@ Slice::Ruby::CodeVisitor::writeConstructorParams(const DataMemberList& members)
         {
             writeConstantValue(member->type(), member->defaultValueType(), *member->defaultValue());
         }
-        else if (member->optional())
+        else if (member->isOptional())
         {
             _out << "Ice::Unset";
         }

data/dist/ice/cpp/src/slice2rb/RubyUtil.h

@@ -9,13 +9,10 @@
 namespace Slice::Ruby
 {
     /// Generates Ruby code for the provided translation unit.
-    void generate(
-        const Slice::UnitPtr& unit,
-        bool all,
-        const std::vector<std::string>& includePaths,
-        IceInternal::Output& out);
+    void
+    generate(const UnitPtr& unit, bool all, const std::vector<std::string>& includePaths, IceInternal::Output& out);
 
-    /// This enum is used by ::getMappedName to control the casing of the identifier it returns.
+    /// This enum is used by `getMappedName` to control the casing of the identifier it returns.
     enum IdentStyle
     {
         /// No change will be made to the mapped identifier.
@@ -31,17 +28,17 @@ namespace Slice::Ruby
     /// Returns the mapped name of the provided Slice element.
     /// If the element has 'ruby:identifier' metadata on it, the metadata's argument is returned as-is.
     /// Otherwise, the slice name is returned, after its casing has been fixed according to the provided @p style.
-    std::string getMappedName(const Slice::ContainedPtr& p, IdentStyle style = IdentNormal);
+    std::string getMappedName(const ContainedPtr& p, IdentStyle style = IdentNormal);
 
     /// Returns the fully-qualified mapped-identifier of the provided Slice element.
-    /// This is equivalent to calling ::getMappedName on @p p and all it's containers.
-    std::string getAbsolute(const Slice::ContainedPtr& p);
+    /// This is equivalent to calling `getMappedName` on @p p and all it's containers.
+    std::string getAbsolute(const ContainedPtr& p);
 
-    /// Equivalent to ::getMappedName but with "T_" preprended to the name.
-    std::string getMetaTypeName(const Slice::ContainedPtr& p);
+    /// Equivalent to `getMappedName` but with "T_" preprended to the name.
+    std::string getMetaTypeName(const ContainedPtr& p);
 
-    /// Equivalent to ::getAbsolute but with "T_" preprended to the name.
-    std::string getMetaTypeReference(const Slice::ContainedPtr& p);
+    /// Equivalent to `getAbsolute` but with "T_" preprended to the name.
+    std::string getMetaTypeReference(const ContainedPtr& p);
 
     /// Emits a comment header for a generated file.
     void printHeader(IceInternal::Output& out);

data/dist/ice/slice/Ice/Identity.ice

@@ -16,6 +16,9 @@
 [["js:module:@zeroc/ice"]]
 
 /// The Ice RPC framework.
+#ifdef __ICERPC__
+["cs:identifier:IceRpc.Ice"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {

data/dist/ice/slice/Ice/Locator.ice

@@ -12,17 +12,18 @@
 
 #include "Identity.ice"
 
+#ifdef __ICERPC__
+["cs:identifier:IceRpc.Ice"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {
-    /// The exception that is thrown by a {@link Locator} implementation when it cannot find an object adapter with the
-    /// provided adapter ID.
+    /// The exception that is thrown by a {@link Locator} implementation when it cannot find an object adapter.
     exception AdapterNotFoundException
     {
     }
 
-    /// The exception that is thrown by a {@link Locator} implementation when it cannot find an object with the provided
-    /// identity.
+    /// The exception that is thrown by a {@link Locator} implementation when it cannot find an object.
     exception ObjectNotFoundException
     {
     }
@@ -34,7 +35,7 @@ module Ice
     /// their object adapters.
     interface Locator
     {
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// {@link findAdapterById}.
         /// @param id The identity.

data/dist/ice/slice/Ice/LocatorRegistry.ice

@@ -12,6 +12,9 @@
 
 #include "Locator.ice"
 
+#ifdef __ICERPC__
+["cs:identifier:IceRpc.Ice"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {

data/dist/ice/slice/Ice/Metrics.ice

@@ -92,7 +92,7 @@ module IceMX
         /// @param view The name of the metrics view.
         /// @param timestamp The local time of the process when the metrics objects were retrieved.
         /// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The @p timestamp allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// @throws UnknownMetricsView Thrown when the metrics view cannot be found.
         ["format:sliced"]

data/dist/ice/slice/Ice/OperationMode.ice

@@ -12,10 +12,18 @@
 
 [["js:module:@zeroc/ice"]]
 
+#ifdef __ICERPC__
+// In IceRPC, OperationMode is an internal implementation detail of the Ice protocol; the corresponding generated code
+// is not publicly visible.
+["cs:identifier:IceRpc.Internal"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {
     /// Specifies if an operation is idempotent, which affects the retry behavior of the Ice client runtime.
+    #ifdef __ICERPC__
+    ["cs:internal"]
+    #endif
     enum OperationMode
     {
         /// A non-idempotent operation (the default). The Ice client runtime guarantees that it will not violate

data/dist/ice/slice/Ice/Process.ice

@@ -10,6 +10,9 @@
 
 #include "LocatorRegistry.ice"
 
+#ifdef __ICERPC__
+["cs:identifier:IceRpc.Ice"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {

data/dist/ice/slice/Ice/ReplyStatus.ice

@@ -12,12 +12,20 @@
 
 [["js:module:@zeroc/ice"]]
 
+#ifdef __ICERPC__
+// In IceRPC, ReplyStatus is an internal implementation detail of the Ice protocol; the corresponding generated code is
+// not publicly visible.
+["cs:identifier:IceRpc.Internal"]
+#endif
 ["java:identifier:com.zeroc.Ice"]
 module Ice
 {
     /// Represents the status of a reply.
     /// A reply status can have any value in the range 0..255. Do not use this enum to marshal or unmarshal a reply
     /// status unless you know its value corresponds to one of the enumerators defined below.
+    #ifdef __ICERPC__
+    ["cs:internal"]
+    #endif
     enum ReplyStatus
     {
         /// The dispatch completed successfully.
@@ -61,5 +69,10 @@ module Ice
         /// The caller is not authorized to access the requested resource.
         ["swift:identifier:unauthorized"]
         Unauthorized,
+
+        /// The dispatch failed because the request requires a feature that the server or the target servant does not
+        /// support.
+        ["swift:identifier:notSupported"]
+        NotSupported,
     }
 }

data/dist/lib/Glacier2/Metrics.rb

@@ -1,6 +1,6 @@
 # Copyright (c) ZeroC, Inc.
 
-# slice2rb version 3.8.1
+# slice2rb version 3.8.2
 # <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
 
 require 'Ice'

data/dist/lib/Glacier2/PermissionsVerifier.rb

@@ -1,6 +1,6 @@
 # Copyright (c) ZeroC, Inc.
 
-# slice2rb version 3.8.1
+# slice2rb version 3.8.2
 # <auto-generated>Generated from Slice file 'PermissionsVerifier.ice'.</auto-generated>
 
 require 'Ice'
@@ -36,7 +36,7 @@ module ::Glacier2
 
         T_PermissionsVerifierPrx.defineProxy(PermissionsVerifierPrx, nil, [])
 
-        PermissionsVerifierPrx_mixin::OP_checkPermissions = Ice::__defineOperation('checkPermissions', 'checkPermissions', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException])
+        PermissionsVerifierPrx_mixin::OP_checkPermissions = Ice::__defineOperation('checkPermissions', 'checkPermissions', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException], false)
     end
 
     if not defined?(::Glacier2::T_SSLPermissionsVerifierPrx)
@@ -56,6 +56,6 @@ module ::Glacier2
 
         T_SSLPermissionsVerifierPrx.defineProxy(SSLPermissionsVerifierPrx, nil, [])
 
-        SSLPermissionsVerifierPrx_mixin::OP_authorize = Ice::__defineOperation('authorize', 'authorize', Ice::OperationMode::Idempotent, nil, [[::Glacier2::T_SSLInfo, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException])
+        SSLPermissionsVerifierPrx_mixin::OP_authorize = Ice::__defineOperation('authorize', 'authorize', Ice::OperationMode::Idempotent, nil, [[::Glacier2::T_SSLInfo, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException], false)
     end
 end

data/dist/lib/Glacier2/Router.rb

@@ -1,6 +1,6 @@
 # Copyright (c) ZeroC, Inc.
 
-# slice2rb version 3.8.1
+# slice2rb version 3.8.2
 # <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
 
 require 'Ice'
@@ -61,13 +61,13 @@ module ::Glacier2
 
         T_RouterPrx.defineProxy(RouterPrx, nil, [::Ice::T_RouterPrx])
 
-        RouterPrx_mixin::OP_getCategoryForClient = Ice::__defineOperation('getCategoryForClient', 'getCategoryForClient', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_string, false, 0], [])
-        RouterPrx_mixin::OP_createSession = Ice::__defineOperation('createSession', 'createSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException])
-        RouterPrx_mixin::OP_createSessionFromSecureConnection = Ice::__defineOperation('createSessionFromSecureConnection', 'createSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException])
-        RouterPrx_mixin::OP_refreshSession = Ice::__defineOperation('refreshSession', 'refreshSession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException])
+        RouterPrx_mixin::OP_getCategoryForClient = Ice::__defineOperation('getCategoryForClient', 'getCategoryForClient', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_string, false, 0], [], false)
+        RouterPrx_mixin::OP_createSession = Ice::__defineOperation('createSession', 'createSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException], false)
+        RouterPrx_mixin::OP_createSessionFromSecureConnection = Ice::__defineOperation('createSessionFromSecureConnection', 'createSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException], false)
+        RouterPrx_mixin::OP_refreshSession = Ice::__defineOperation('refreshSession', 'refreshSession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException], false)
         RouterPrx_mixin::OP_refreshSession.deprecate("As of Ice 3.8, this operation does nothing.")
-        RouterPrx_mixin::OP_destroySession = Ice::__defineOperation('destroySession', 'destroySession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException])
-        RouterPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_long, false, 0], [])
-        RouterPrx_mixin::OP_getACMTimeout = Ice::__defineOperation('getACMTimeout', 'getACMTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [])
+        RouterPrx_mixin::OP_destroySession = Ice::__defineOperation('destroySession', 'destroySession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException], false)
+        RouterPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_long, false, 0], [], false)
+        RouterPrx_mixin::OP_getACMTimeout = Ice::__defineOperation('getACMTimeout', 'getACMTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [], false)
     end
 end

data/dist/lib/Glacier2/SSLInfo.rb

@@ -1,6 +1,6 @@
 # Copyright (c) ZeroC, Inc.
 
-# slice2rb version 3.8.1
+# slice2rb version 3.8.2
 # <auto-generated>Generated from Slice file 'SSLInfo.ice'.</auto-generated>
 
 require 'Ice'