QPID-6256: Improved handling of protocol version incompatibilities

* 0-10 path no longer hans on open when connecting to a broker not
  supporting that version
* the 'protocol'  connection option now supports specifying multiple
  protocols to try in order (as a coma separated list)
* the protocol defaults, i.e. the value assumed if the 'protocol'
  connection option is not specified, can now be set via the client
  config file (e.g. protocol-defaults=amqp1.0,amqp0-10) or an
  environment variable (e.g QPID_PROTOCOL_DEFAULTS=amqp1.0,amqp0-10)
* if neither the connection option nor the defaults are specified
  all valid versions will be tried (currently amqp0-10, then amqp1.0
  but this may change in a future version)

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

1 files changed, 1 insertions, 0 deletions

diff --git a/qpid/cpp/src/qpid/framing/ProtocolInitiation.h b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
index c519bc2442..fe6410af55 100644
--- a/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
@@ -47,6 +47,7 @@ public:
     inline uint8_t getMinor() const { return version.getMinor(); }
     inline ProtocolVersion getVersion() const { return version; }
     bool operator==(ProtocolVersion v) const { return v == getVersion(); }
+    bool matches(ProtocolVersion v) const { return v == getVersion(); }
 };
 
 QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& o, const framing::ProtocolInitiation& pi);