QPID-4368: Updated protocol version header handling to recognise 1.0 headers

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1400175 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 31 insertions, 8 deletions

diff --git a/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 00ddb55a3b..19cb3f0e3d 100644
--- a/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
@@ -38,10 +38,17 @@ void ProtocolInitiation::encode(Buffer& buffer) const {
     buffer.putOctet('M');
     buffer.putOctet('Q');
     buffer.putOctet('P');
-    buffer.putOctet(1);//class
-    buffer.putOctet(1);//instance
-    buffer.putOctet(version.getMajor());
-    buffer.putOctet(version.getMinor());    
+    if (version.getMajor() == 1) {
+        buffer.putOctet(version.getProtocol());
+        buffer.putOctet(version.getMajor());
+        buffer.putOctet(version.getMinor());
+        buffer.putOctet(0);//revision
+    } else {
+        buffer.putOctet(1);//class
+        buffer.putOctet(1);//instance
+        buffer.putOctet(version.getMajor());
+        buffer.putOctet(version.getMinor());
+    }
 }
 
 bool ProtocolInitiation::decode(Buffer& buffer){
@@ -50,10 +57,18 @@ bool ProtocolInitiation::decode(Buffer& buffer){
 	buffer.getOctet();//M
 	buffer.getOctet();//Q
 	buffer.getOctet();//P
-	buffer.getOctet();//class
-	buffer.getOctet();//instance
-	version.setMajor(buffer.getOctet());
-	version.setMinor(buffer.getOctet());
+	uint8_t protocolClass = buffer.getOctet();//class
+        version.setProtocol(protocolClass);
+        if (protocolClass == 1) {
+            //old (pre-1.0) style
+            buffer.getOctet();//instance
+            version.setMajor(buffer.getOctet());
+            version.setMinor(buffer.getOctet());
+        } else {
+            version.setMajor(buffer.getOctet());
+            version.setMinor(buffer.getOctet());
+            buffer.getOctet();//revision
+        }
 	return true;
     }else{
 	return false;
diff --git a/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
index c63cddb4cc..174fc3e65b 100644
--- a/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
@@ -27,6 +27,10 @@ const std::string ProtocolVersion::toString() const
 {
     std::stringstream ss;
     ss << major_ << "-" << minor_;
+    if (major_ == 1) {
+        if (protocol_ == SASL) ss << " (SASL)";
+        else if (protocol_ == TLS) ss << " (TLS)";
+    }
     return ss.str();
 }
 
@@ -42,3 +46,7 @@ bool ProtocolVersion::operator==(ProtocolVersion p) const
     return major_ == p.major_ && minor_ == p.minor_;
 }
 
+uint8_t ProtocolVersion::AMQP(0);
+uint8_t ProtocolVersion::LEGACY_AMQP(1);
+uint8_t ProtocolVersion::TLS(2);
+uint8_t ProtocolVersion::SASL(3);