summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Protocol.h
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2003-03-05 04:44:06 +0000
committerMichi Henning <michi@zeroc.com>2003-03-05 04:44:06 +0000
commitcbf6716868fd679530dc38be5b956ede9fbea612 (patch)
treebeaed87efc62a11ecdaae0778923176d6c00e31b /cpp/src/Ice/Protocol.h
parentuse depend tag (diff)
downloadice-cbf6716868fd679530dc38be5b956ede9fbea612.tar.bz2
ice-cbf6716868fd679530dc38be5b956ede9fbea612.tar.xz
ice-cbf6716868fd679530dc38be5b956ede9fbea612.zip
Merged in changes for protocol versioning.
Diffstat (limited to 'cpp/src/Ice/Protocol.h')
-rw-r--r--cpp/src/Ice/Protocol.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/cpp/src/Ice/Protocol.h b/cpp/src/Ice/Protocol.h
index a82628fd19b..ae0e232bafe 100644
--- a/cpp/src/Ice/Protocol.h
+++ b/cpp/src/Ice/Protocol.h
@@ -23,18 +23,28 @@ namespace IceInternal
//
// Size of the Ice protocol header
//
-// Protocol version (Byte)
-// Encoding version (Byte)
+// Magic number (4 Bytes)
+// Protocol version major (Byte)
+// Protocol version minor (Byte)
+// Encoding version major (Byte)
+// Encoding version minor (Byte)
// Message type (Byte)
// Message size (Int)
//
-const ::Ice::Int headerSize = 7;
+const ::Ice::Int headerSize = 13;
+
+//
+// The magic number at the front of each message
+//
+const ::Ice::Byte magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P'
//
// The current Ice protocol and encoding version
//
-const ::Ice::Byte protocolVersion = 0;
-const ::Ice::Byte encodingVersion = 0;
+const ::Ice::Byte protocolMajor = 1;
+const ::Ice::Byte protocolMinor = 0;
+const ::Ice::Byte encodingMajor = 1;
+const ::Ice::Byte encodingMinor = 0;
//
// The Ice protocol message types