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,17 +1,17 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Parser/StreamFeaturesParser.h>
 
 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&) {
 	if (currentDepth_ == 1) {
 		if (element == "starttls" && ns == "urn:ietf:params:xml:ns:xmpp-tls") {
 			getElementGeneric()->setHasStartTLS();
@@ -41,12 +41,17 @@ void StreamFeaturesParser::handleStartElement(const std::string& element, const
 			currentText_ = "";
 		}
 		else if (inMechanisms_ && element == "mechanism") {
 			inMechanism_ = true;
 			currentText_ = "";
 		}
+		else if (inMechanisms_ && element == "hostname" && ns == "urn:xmpp:domain-based-name:1") {
+			inAuthenticationHostname_ = true;
+			currentText_ = "";
+		}
+
 	}
 	++currentDepth_;
 }
 
 void StreamFeaturesParser::handleEndElement(const std::string&, const std::string&) {
 	--currentDepth_;
@@ -60,12 +65,16 @@ void StreamFeaturesParser::handleEndElement(const std::string&, const std::strin
 			inCompressionMethod_ = false;
 		}
 		else if (inMechanism_) {
 			getElementGeneric()->addAuthenticationMechanism(currentText_);
 			inMechanism_ = false;
 		}
+		else if (inAuthenticationHostname_) {
+			getElementGeneric()->setAuthenticationHostname(currentText_);
+			inAuthenticationHostname_ = false;
+		}
 	}
 }
 
 void StreamFeaturesParser::handleCharacterData(const std::string& data) {
 	currentText_ += data;
 }