Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-10-30 08:05:07 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-10-30 12:13:22 (GMT) |
| commit | 8baf0e407b3b4914654a6036a16ac81b7a2e7414 (patch) | |
| tree | 1a7cb840d2b8630357106ed69cd16081fea16147 /Swiften/Parser/StreamErrorParser.cpp | |
| parent | a616265f7a5a48c5769262027795f99df91a6ae8 (diff) | |
| download | swift-8baf0e407b3b4914654a6036a16ac81b7a2e7414.zip swift-8baf0e407b3b4914654a6036a16ac81b7a2e7414.tar.bz2 | |
Bring StreamError enum to spec
RFC 6120 no longer defines invalid-id, and adds unsupported-feature.
The StreamError enum was derived from the schema in section A.2, which
erroneously had these two deviations from 4.9.3.
Test-Information:
Unit tests pass on Debian 9
Change-Id: I2bb3d0b09448877bbd4618fa852baab87bfa1abc
Diffstat (limited to 'Swiften/Parser/StreamErrorParser.cpp')
| -rw-r--r-- | Swiften/Parser/StreamErrorParser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Parser/StreamErrorParser.cpp b/Swiften/Parser/StreamErrorParser.cpp index 64e0681..e89af58 100644 --- a/Swiften/Parser/StreamErrorParser.cpp +++ b/Swiften/Parser/StreamErrorParser.cpp @@ -42,21 +42,18 @@ void StreamErrorParser::handleEndElement(const std::string& element, const std:: else if(element == "improper-addressing") { getElementGeneric()->setType(StreamError::ImproperAddressing); } else if(element == "internal-server-error") { getElementGeneric()->setType(StreamError::InternalServerError); } else if(element == "invalid-from") { getElementGeneric()->setType(StreamError::InvalidFrom); } - else if(element == "invalid-id") { - getElementGeneric()->setType(StreamError::InvalidID); - } else if(element == "invalid-namespace") { getElementGeneric()->setType(StreamError::InvalidNamespace); } else if(element == "invalid-xml") { getElementGeneric()->setType(StreamError::InvalidXML); } else if(element == "not-authorized") { getElementGeneric()->setType(StreamError::NotAuthorized); } @@ -84,18 +81,21 @@ void StreamErrorParser::handleEndElement(const std::string& element, const std:: else if(element == "system-shutdown") { getElementGeneric()->setType(StreamError::SystemShutdown); } else if(element == "undefined-condition") { getElementGeneric()->setType(StreamError::UndefinedCondition); } else if(element == "unsupported-encoding") { getElementGeneric()->setType(StreamError::UnsupportedEncoding); } + else if(element == "unsupported-feature") { + getElementGeneric()->setType(StreamError::UnsupportedFeature); + } else if(element == "unsupported-stanza-type") { getElementGeneric()->setType(StreamError::UnsupportedStanzaType); } else if(element == "unsupported-version") { getElementGeneric()->setType(StreamError::UnsupportedVersion); } else { getElementGeneric()->setType(StreamError::UndefinedCondition); } |