summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMili Verma <mili.verma@isode.com>2015-06-23 09:08:56 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-06-29 14:51:46 (GMT)
commitea41bd07a0e014c12cce144b421abac9f21d1269 (patch)
treef6c5b44863d8cb7949bfe5ce29da90f07878efe9 /Swiften/Parser/StreamFeaturesParser.cpp
parent595fdfa75d4757d5654bf3189c23c85a66ec6836 (diff)
downloadswift-ea41bd07a0e014c12cce144b421abac9f21d1269.zip
swift-ea41bd07a0e014c12cce144b421abac9f21d1269.tar.bz2
Parse hostname for xep-0233
Test-information: Verified with M-Link. Unit tests pass. Change-Id: Ic675c8d7cd70e01be61c51c0280e1d7208b364ba
Diffstat (limited to 'Swiften/Parser/StreamFeaturesParser.cpp')
-rw-r--r--Swiften/Parser/StreamFeaturesParser.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/Swiften/Parser/StreamFeaturesParser.cpp b/Swiften/Parser/StreamFeaturesParser.cpp
index f0b8c9a..913c50d 100644
--- a/Swiften/Parser/StreamFeaturesParser.cpp
+++ b/Swiften/Parser/StreamFeaturesParser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,7 +8,7 @@
namespace Swift {
-StreamFeaturesParser::StreamFeaturesParser() : GenericElementParser<StreamFeatures>(), currentDepth_(0), inMechanisms_(false), inMechanism_(false), inCompression_(false), inCompressionMethod_(false) {
+StreamFeaturesParser::StreamFeaturesParser() : GenericElementParser<StreamFeatures>(), currentDepth_(0), inMechanisms_(false), inMechanism_(false), inAuthenticationHostname_(false), inCompression_(false), inCompressionMethod_(false) {
}
void StreamFeaturesParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap&) {
@@ -44,6 +44,11 @@ void StreamFeaturesParser::handleStartElement(const std::string& element, const
inMechanism_ = true;
currentText_ = "";
}
+ else if (inMechanisms_ && element == "hostname" && ns == "urn:xmpp:domain-based-name:1") {
+ inAuthenticationHostname_ = true;
+ currentText_ = "";
+ }
+
}
++currentDepth_;
}
@@ -63,6 +68,10 @@ void StreamFeaturesParser::handleEndElement(const std::string&, const std::strin
getElementGeneric()->addAuthenticationMechanism(currentText_);
inMechanism_ = false;
}
+ else if (inAuthenticationHostname_) {
+ getElementGeneric()->setAuthenticationHostname(currentText_);
+ inAuthenticationHostname_ = false;
+ }
}
}