Added magic number and versioning to Ice protocol. Encapsulations are still

    written with version number *outside* the encapsulation. Will probably
    change that to inside soon.

1 files changed, 10 insertions, 5 deletions

diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index c38f47fc06c..526c850da72 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -19,18 +19,23 @@ final class Protocol
     //
     // Size of the Ice protocol header
     //
-    // Protocol version (Byte)
-    // Encoding version (Byte)
+    // Magic number (4 bytes): 'I', 'c', 'e', 'P' in ASCII encoding
+    // 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 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