summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Protocol.java
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 /java/src/IceInternal/Protocol.java
parentuse depend tag (diff)
downloadice-cbf6716868fd679530dc38be5b956ede9fbea612.tar.bz2
ice-cbf6716868fd679530dc38be5b956ede9fbea612.tar.xz
ice-cbf6716868fd679530dc38be5b956ede9fbea612.zip
Merged in changes for protocol versioning.
Diffstat (limited to 'java/src/IceInternal/Protocol.java')
-rw-r--r--java/src/IceInternal/Protocol.java20
1 files changed, 15 insertions, 5 deletions
diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index c38f47fc06c..35a9c57a702 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -19,18 +19,28 @@ final class Protocol
//
// 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)
//
- final static int headerSize = 7;
+ final static int headerSize = 13;
+
+ //
+ // The magic number at the front of each message
+ //
+ final static byte magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P'
//
// The current Ice protocol and encoding version
//
- final static byte protocolVersion = 0;
- final static byte encodingVersion = 0;
+ final static byte protocolMajor = 1;
+ final static byte protocolMinor = 0;
+ final static byte encodingMajor = 1;
+ final static byte encodingMinor = 0;
//
// The Ice protocol message types