summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp')
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp
index 61447cd..5e74d8e 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp
@@ -1,68 +1,67 @@
/*
* Copyright (c) 2011 Tobias Markmann
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
* Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h>
#include <memory>
#include <boost/lexical_cast.hpp>
#include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
#include <Swiften/Serializer/XML/XMLElement.h>
#include <Swiften/Serializer/XML/XMLNode.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
namespace Swift {
JingleS5BTransportPayloadSerializer::JingleS5BTransportPayloadSerializer() {
}
std::string JingleS5BTransportPayloadSerializer::serializePayload(std::shared_ptr<JingleS5BTransportPayload> payload) const {
XMLElement payloadXML("transport", "urn:xmpp:jingle:transports:s5b:1");
payloadXML.setAttribute("sid", payload->getSessionID());
payloadXML.setAttribute("mode", modeToString(payload->getMode()));
if (!payload->getDstAddr().empty()) {
payloadXML.setAttribute("dstaddr", payload->getDstAddr());
}
- foreach(JingleS5BTransportPayload::Candidate candidate, payload->getCandidates()) {
+ for (const auto& candidate : payload->getCandidates()) {
std::shared_ptr<XMLElement> candidateXML = std::make_shared<XMLElement>("candidate");
candidateXML->setAttribute("cid", candidate.cid);
candidateXML->setAttribute("host", candidate.hostPort.getAddress().toString());
candidateXML->setAttribute("jid", candidate.jid.toString());
candidateXML->setAttribute("port", boost::lexical_cast<std::string>(candidate.hostPort.getPort()));
candidateXML->setAttribute("priority", boost::lexical_cast<std::string>(candidate.priority));
candidateXML->setAttribute("type", typeToString(candidate.type));
payloadXML.addNode(candidateXML);
}
if (payload->hasCandidateError()) {
payloadXML.addNode(std::make_shared<XMLElement>("candidate-error"));
}
if (payload->hasProxyError()) {
payloadXML.addNode(std::make_shared<XMLElement>("proxy-error"));
}
if (!payload->getActivated().empty()) {
std::shared_ptr<XMLElement> activatedXML = std::make_shared<XMLElement>("activated");
activatedXML->setAttribute("cid", payload->getActivated());
payloadXML.addNode(activatedXML);
}
if (!payload->getCandidateUsed().empty()) {
std::shared_ptr<XMLElement> candusedXML = std::make_shared<XMLElement>("candidate-used");
candusedXML->setAttribute("cid", payload->getCandidateUsed());
payloadXML.addNode(candusedXML);
}
return payloadXML.serialize();
}