Swiftdiff options
| author | Mili Verma <mili.verma@isode.com> | 2015-06-23 09:08:56 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-06-29 14:51:46 (GMT) |
| commit | ea41bd07a0e014c12cce144b421abac9f21d1269 (patch) | |
| tree | f6c5b44863d8cb7949bfe5ce29da90f07878efe9 /Swiften/Parser/StreamFeaturesParser.cpp | |
| parent | 595fdfa75d4757d5654bf3189c23c85a66ec6836 (diff) | |
| download | swift-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.cpp | 13 |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | namespace Swift { | 9 | namespace Swift { |
| 10 | 10 | ||
| 11 | StreamFeaturesParser::StreamFeaturesParser() : GenericElementParser<StreamFeatures>(), currentDepth_(0), inMechanisms_(false), inMechanism_(false), inCompression_(false), inCompressionMethod_(false) { | 11 | StreamFeaturesParser::StreamFeaturesParser() : GenericElementParser<StreamFeatures>(), currentDepth_(0), inMechanisms_(false), inMechanism_(false), inAuthenticationHostname_(false), inCompression_(false), inCompressionMethod_(false) { |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | void StreamFeaturesParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap&) { | 14 | 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 | |||
| 44 | inMechanism_ = true; | 44 | inMechanism_ = true; |
| 45 | currentText_ = ""; | 45 | currentText_ = ""; |
| 46 | } | 46 | } |
| 47 | else if (inMechanisms_ && element == "hostname" && ns == "urn:xmpp:domain-based-name:1") { | ||
| 48 | inAuthenticationHostname_ = true; | ||
| 49 | currentText_ = ""; | ||
| 50 | } | ||
| 51 | |||
| 47 | } | 52 | } |
| 48 | ++currentDepth_; | 53 | ++currentDepth_; |
| 49 | } | 54 | } |
| @@ -63,6 +68,10 @@ void StreamFeaturesParser::handleEndElement(const std::string&, const std::strin | |||
| 63 | getElementGeneric()->addAuthenticationMechanism(currentText_); | 68 | getElementGeneric()->addAuthenticationMechanism(currentText_); |
| 64 | inMechanism_ = false; | 69 | inMechanism_ = false; |
| 65 | } | 70 | } |
| 71 | else if (inAuthenticationHostname_) { | ||
| 72 | getElementGeneric()->setAuthenticationHostname(currentText_); | ||
| 73 | inAuthenticationHostname_ = false; | ||
| 74 | } | ||
| 66 | } | 75 | } |
| 67 | } | 76 | } |
| 68 | 77 | ||