QMF updates:

  - Added "sendUserId" option (defaults to true) to QMF connection settings
  - Implemented the user-id function using "negotiatedSettings" from qpid::client::Connection
  - Fixed a sign-extension bug in Value
  - Added tests for all of the above


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

1 files changed, 4 insertions, 2 deletions

diff --git a/qpid/cpp/src/qmf/ConnectionSettingsImpl.cpp b/qpid/cpp/src/qmf/ConnectionSettingsImpl.cpp
index fa0257aeba..63ce53b751 100644
--- a/qpid/cpp/src/qmf/ConnectionSettingsImpl.cpp
+++ b/qpid/cpp/src/qmf/ConnectionSettingsImpl.cpp
@@ -43,14 +43,15 @@ const string attrMaxSsf("maxSsf");
 const string attrRetryDelayMin("retryDelayMin");
 const string attrRetryDelayMax("retryDelayMax");
 const string attrRetryDelayFactor("retryDelayFactor");
+const string attrSendUserId("sendUserId");
 
 ConnectionSettingsImpl::ConnectionSettingsImpl() :
-    retryDelayMin(1), retryDelayMax(64), retryDelayFactor(2)
+    retryDelayMin(1), retryDelayMax(64), retryDelayFactor(2), sendUserId(true)
 {
 }
 
 ConnectionSettingsImpl::ConnectionSettingsImpl(const string& /*url*/) :
-    retryDelayMin(1), retryDelayMax(64), retryDelayFactor(2)
+    retryDelayMin(1), retryDelayMax(64), retryDelayFactor(2), sendUserId(true)
 {
     // TODO: Parse the URL
 }
@@ -77,6 +78,7 @@ void ConnectionSettingsImpl::setAttr(const string& key, const Value& value)
     else if (key == attrRetryDelayMin)    retryDelayMin    = value.asUint();
     else if (key == attrRetryDelayMax)    retryDelayMax    = value.asUint();
     else if (key == attrRetryDelayFactor) retryDelayFactor = value.asUint();
+    else if (key == attrSendUserId)       sendUserId       = value.asBool();
 }
 
 Value ConnectionSettingsImpl::getAttr(const string& key) const