Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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
@@ -21,32 +21,32 @@ namespace Swift {
BadFormat,
BadNamespacePrefix,
Conflict,
ConnectionTimeout,
HostGone,
HostUnknown,
ImproperAddressing,
InternalServerError,
InvalidFrom,
- InvalidID,
InvalidNamespace,
InvalidXML,
NotAuthorized,
NotWellFormed,
PolicyViolation,
RemoteConnectionFailed,
Reset,
ResourceConstraint,
RestrictedXML,
SeeOtherHost,
SystemShutdown,
UndefinedCondition,
UnsupportedEncoding,
+ UnsupportedFeature,
UnsupportedStanzaType,
UnsupportedVersion
};
StreamError(Type type = UndefinedCondition, const std::string& text = std::string()) : type_(type), text_(text) { }
Type getType() const {
return type_;
}
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);
}
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
@@ -24,32 +24,32 @@ SafeByteArray StreamErrorSerializer::serialize(std::shared_ptr<ToplevelElement>
case StreamError::BadFormat: typeTag = "bad-format"; break;
case StreamError::BadNamespacePrefix: typeTag = "bad-namespace-prefix"; break;
case StreamError::Conflict: typeTag = "conflict"; break;
case StreamError::ConnectionTimeout: typeTag = "connection-timeout"; break;
case StreamError::HostGone: typeTag = "host-gone"; break;
case StreamError::HostUnknown: typeTag = "host-unknown"; break;
case StreamError::ImproperAddressing: typeTag = "improper-addressing"; break;
case StreamError::InternalServerError: typeTag = "internal-server-error"; break;
case StreamError::InvalidFrom: typeTag = "invalid-from"; break;
- case StreamError::InvalidID: typeTag = "invalid-id"; break;
case StreamError::InvalidNamespace: typeTag = "invalid-namespace"; break;
case StreamError::InvalidXML: typeTag = "invalid-xml"; break;
case StreamError::NotAuthorized: typeTag = "not-authorized"; break;
case StreamError::NotWellFormed: typeTag = "not-well-formed"; break;
case StreamError::PolicyViolation: typeTag = "policy-violation"; break;
case StreamError::RemoteConnectionFailed: typeTag = "remote-connection-failed"; break;
case StreamError::Reset: typeTag = "reset"; break;
case StreamError::ResourceConstraint: typeTag = "resource-constraint"; break;
case StreamError::RestrictedXML: typeTag = "restricted-xml"; break;
case StreamError::SeeOtherHost: typeTag = "see-other-host"; break;
case StreamError::SystemShutdown: typeTag = "system-shutdown"; break;
case StreamError::UndefinedCondition: typeTag = "undefined-condition"; break;
case StreamError::UnsupportedEncoding: typeTag = "unsupported-encoding"; break;
+ case StreamError::UnsupportedFeature: typeTag = "unsupported-feature"; break;
case StreamError::UnsupportedStanzaType: typeTag = "unsupported-stanza-type"; break;
case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break;
}
errorElement.addNode(std::make_shared<XMLElement>(typeTag, "urn:ietf:params:xml:ns:xmpp-streams"));
if (!error->getText().empty()) {
errorElement.addNode(std::make_shared<XMLElement>("text", "urn:ietf:params:xml:ns:xmpp-streams", error->getText()));
}