Restrict connection close codes to the set defined in the spec

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

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp b/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
index 8f48e72c2d..0e57e4b3f1 100644
--- a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
+++ b/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
@@ -48,6 +48,17 @@ bool isSessionDetachedControl(AMQMethodBody* m) {
     return isSessionControl(m) &&
         m->amqpMethodId() == SESSION_DETACHED_METHOD_ID;
 }
+
+session::DetachCode convert(uint8_t code) {
+    switch(code) {
+      case 0: return session::DETACH_CODE_NORMAL;
+      case 1: return session::DETACH_CODE_SESSION_BUSY;
+      case 2: return session::DETACH_CODE_TRANSPORT_BUSY;
+      case 3: return session::DETACH_CODE_NOT_ATTACHED;
+      case 4: default: return session::DETACH_CODE_UNKNOWN_IDS;
+    }
+}
+
 } // namespace
 
 void SessionHandler::checkAttached() {
@@ -167,7 +178,7 @@ void SessionHandler::detached(const std::string& name, uint8_t code) {
     checkName(name);
     ignoring = false;
     if (code != session::DETACH_CODE_NORMAL)
-        channelException(code, "session.detached from peer.");
+        channelException(convert(code), "session.detached from peer.");
     else {
         handleDetach();
     }