Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2019-10-30 08:05:07 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2019-10-30 12:13:22 (GMT)
commit8baf0e407b3b4914654a6036a16ac81b7a2e7414 (patch)
tree1a7cb840d2b8630357106ed69cd16081fea16147
parenta616265f7a5a48c5769262027795f99df91a6ae8 (diff)
downloadswift-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
-rw-r--r--Swiften/Elements/StreamError.h2
-rw-r--r--Swiften/Parser/StreamErrorParser.cpp6
-rw-r--r--Swiften/Serializer/StreamErrorSerializer.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Elements/StreamError.h b/Swiften/Elements/StreamError.h
index aa294fd..6dda15c 100644
--- a/Swiften/Elements/StreamError.h
+++ b/Swiften/Elements/StreamError.h
@@ -27,7 +27,6 @@ namespace Swift {
27 ImproperAddressing, 27 ImproperAddressing,
28 InternalServerError, 28 InternalServerError,
29 InvalidFrom, 29 InvalidFrom,
30 InvalidID,
31 InvalidNamespace, 30 InvalidNamespace,
32 InvalidXML, 31 InvalidXML,
33 NotAuthorized, 32 NotAuthorized,
@@ -41,6 +40,7 @@ namespace Swift {
41 SystemShutdown, 40 SystemShutdown,
42 UndefinedCondition, 41 UndefinedCondition,
43 UnsupportedEncoding, 42 UnsupportedEncoding,
43 UnsupportedFeature,
44 UnsupportedStanzaType, 44 UnsupportedStanzaType,
45 UnsupportedVersion 45 UnsupportedVersion
46 }; 46 };
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
@@ -48,9 +48,6 @@ void StreamErrorParser::handleEndElement(const std::string& element, const std::
48 else if(element == "invalid-from") { 48 else if(element == "invalid-from") {
49 getElementGeneric()->setType(StreamError::InvalidFrom); 49 getElementGeneric()->setType(StreamError::InvalidFrom);
50 } 50 }
51 else if(element == "invalid-id") {
52 getElementGeneric()->setType(StreamError::InvalidID);
53 }
54 else if(element == "invalid-namespace") { 51 else if(element == "invalid-namespace") {
55 getElementGeneric()->setType(StreamError::InvalidNamespace); 52 getElementGeneric()->setType(StreamError::InvalidNamespace);
56 } 53 }
@@ -90,6 +87,9 @@ void StreamErrorParser::handleEndElement(const std::string& element, const std::
90 else if(element == "unsupported-encoding") { 87 else if(element == "unsupported-encoding") {
91 getElementGeneric()->setType(StreamError::UnsupportedEncoding); 88 getElementGeneric()->setType(StreamError::UnsupportedEncoding);
92 } 89 }
90 else if(element == "unsupported-feature") {
91 getElementGeneric()->setType(StreamError::UnsupportedFeature);
92 }
93 else if(element == "unsupported-stanza-type") { 93 else if(element == "unsupported-stanza-type") {
94 getElementGeneric()->setType(StreamError::UnsupportedStanzaType); 94 getElementGeneric()->setType(StreamError::UnsupportedStanzaType);
95 } 95 }
diff --git a/Swiften/Serializer/StreamErrorSerializer.cpp b/Swiften/Serializer/StreamErrorSerializer.cpp
index 66a71ca..684e8fe 100644
--- a/Swiften/Serializer/StreamErrorSerializer.cpp
+++ b/Swiften/Serializer/StreamErrorSerializer.cpp
@@ -30,7 +30,6 @@ SafeByteArray StreamErrorSerializer::serialize(std::shared_ptr<ToplevelElement>
30 case StreamError::ImproperAddressing: typeTag = "improper-addressing"; break; 30 case StreamError::ImproperAddressing: typeTag = "improper-addressing"; break;
31 case StreamError::InternalServerError: typeTag = "internal-server-error"; break; 31 case StreamError::InternalServerError: typeTag = "internal-server-error"; break;
32 case StreamError::InvalidFrom: typeTag = "invalid-from"; break; 32 case StreamError::InvalidFrom: typeTag = "invalid-from"; break;
33 case StreamError::InvalidID: typeTag = "invalid-id"; break;
34 case StreamError::InvalidNamespace: typeTag = "invalid-namespace"; break; 33 case StreamError::InvalidNamespace: typeTag = "invalid-namespace"; break;
35 case StreamError::InvalidXML: typeTag = "invalid-xml"; break; 34 case StreamError::InvalidXML: typeTag = "invalid-xml"; break;
36 case StreamError::NotAuthorized: typeTag = "not-authorized"; break; 35 case StreamError::NotAuthorized: typeTag = "not-authorized"; break;
@@ -44,6 +43,7 @@ SafeByteArray StreamErrorSerializer::serialize(std::shared_ptr<ToplevelElement>
44 case StreamError::SystemShutdown: typeTag = "system-shutdown"; break; 43 case StreamError::SystemShutdown: typeTag = "system-shutdown"; break;
45 case StreamError::UndefinedCondition: typeTag = "undefined-condition"; break; 44 case StreamError::UndefinedCondition: typeTag = "undefined-condition"; break;
46 case StreamError::UnsupportedEncoding: typeTag = "unsupported-encoding"; break; 45 case StreamError::UnsupportedEncoding: typeTag = "unsupported-encoding"; break;
46 case StreamError::UnsupportedFeature: typeTag = "unsupported-feature"; break;
47 case StreamError::UnsupportedStanzaType: typeTag = "unsupported-stanza-type"; break; 47 case StreamError::UnsupportedStanzaType: typeTag = "unsupported-stanza-type"; break;
48 case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break; 48 case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break;
49 } 49 }