1 files changed, 79 insertions, 6 deletions

diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 651e6a16f42..aa9ba712587 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Protocol.h>
+#include <Ice/LocalException.h>
 
 namespace IceInternal
 {
@@ -22,8 +23,8 @@ const Ice::Byte requestHdr[] =
     magic[3],
     protocolMajor,
     protocolMinor,
-    encodingMajor,
-    encodingMinor,
+    protocolEncodingMajor,
+    protocolEncodingMinor,
     requestMsg,
     0, // Compression status
     0, 0, 0, 0, // Message size (placeholder)
@@ -38,8 +39,8 @@ const Ice::Byte requestBatchHdr[] =
     magic[3],
     protocolMajor,
     protocolMinor,
-    encodingMajor,
-    encodingMinor,
+    protocolEncodingMajor,
+    protocolEncodingMinor,
     requestBatchMsg,
     0, // Compression status
     0, 0, 0, 0, // Message size (place holder)
@@ -54,11 +55,83 @@ const Ice::Byte replyHdr[] =
     magic[3],
     protocolMajor,
     protocolMinor,
-    encodingMajor,
-    encodingMinor,
+    protocolEncodingMajor,
+    protocolEncodingMinor,
     replyMsg,
     0, // Compression status
     0, 0, 0, 0 // Message size (placeholder)
 };
 
+void
+stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor)
+{
+    std::string::size_type pos = str.find_first_of(".");
+    if(pos == std::string::npos)
+    {
+        Ice::VersionParseException ex(__FILE__, __LINE__);
+        ex.str = "malformed version value `" + str + "'";
+        throw ex;
+    }
+
+    std::istringstream majStr(str.substr(0, pos));
+    Ice::Int majVersion;
+    if(!(majStr >> majVersion) || !majStr.eof())
+    {
+        Ice::VersionParseException ex(__FILE__, __LINE__);
+        ex.str = "invalid major version value `" + str + "'";
+        throw ex;
+    }
+    
+    std::istringstream minStr(str.substr(pos + 1, std::string::npos));
+    Ice::Int minVersion;
+    if(!(minStr >> minVersion) || !minStr.eof())
+    {
+        Ice::VersionParseException ex(__FILE__, __LINE__);
+        ex.str = "invalid minor version value `" + str + "'";
+        throw ex;
+    }
+
+    if(majVersion < 1 || majVersion > 255 || minVersion < 0 || minVersion > 255)
+    {
+        Ice::VersionParseException ex(__FILE__, __LINE__);
+        ex.str = "range error in version `" + str + "'";
+        throw ex;
+    }
+    
+    major = static_cast<Ice::Byte>(majVersion);
+    minor = static_cast<Ice::Byte>(minVersion);
+}
+
+void 
+throwUnsupportedProtocolException(const char* f, int l, const Ice::ProtocolVersion& v, const Ice::ProtocolVersion& s)
+{
+    throw Ice::UnsupportedProtocolException(f, l, "", v, s);
+}
+
+void
+throwUnsupportedEncodingException(const char* f, int l, const Ice::EncodingVersion& v, const Ice::EncodingVersion& s)
+{
+    throw Ice::UnsupportedEncodingException(f, l, "", v, s);
+}
+
+}
+
+namespace Ice
+{
+
+const EncodingVersion currentEncoding = { IceInternal::encodingMajor, IceInternal::encodingMinor };
+const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInternal::protocolMinor };
+
+//
+// The encoding to use for protocol messages, this version is tied to
+// the protocol version.
+//
+const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor, 
+                                                  IceInternal::protocolEncodingMinor };
+
+const ProtocolVersion Protocol_1_0 = { 1, 0 };
+
+const EncodingVersion Encoding_1_0 = { 1, 0 };
+const EncodingVersion Encoding_1_1 = { 1, 1 };
+
 }