summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/JingleParserTest.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
index 1189830..0481a47 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
@@ -237,23 +237,23 @@ void IncomingJingleFileTransfer::finishOffTransfer() {
void IncomingJingleFileTransfer::handleSessionInfoReceived(JinglePayload::ref jinglePayload) {
if (state == Terminated) {
return;
}
JingleFileTransferHash::ref transferHash = jinglePayload->getPayload<JingleFileTransferHash>();
if (transferHash) {
SWIFT_LOG(debug) << "Recevied hash information." << std::endl;
if (transferHash->getHashes().find("sha-1") != transferHash->getHashes().end()) {
algo = "sha-1";
- hash = transferHash->getHashes().at("sha-1");
+ hash = transferHash->getHashes().find("sha-1")->second;
}
else if (transferHash->getHashes().find("md5") != transferHash->getHashes().end()) {
algo = "md5";
- hash = transferHash->getHashes().at("md5");
+ hash = transferHash->getHashes().find("md5")->second;
}
checkIfAllDataReceived();
}
}
void IncomingJingleFileTransfer::handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) {
SWIFT_LOG(debug) << "session terminate received" << std::endl;
if (activeTransport) activeTransport->stop();
if (reason && reason.get().type == JinglePayload::Reason::Cancel) {
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/JingleParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/JingleParserTest.cpp
index d03ba8b..f1f25cd 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/JingleParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/JingleParserTest.cpp
@@ -404,19 +404,19 @@ class JingleParserTest : public CppUnit::TestFixture {
));
JinglePayload::ref jingle = parser.getPayload<JinglePayload>();
CPPUNIT_ASSERT(jingle);
CPPUNIT_ASSERT_EQUAL(JinglePayload::SessionInfo, jingle->getAction());
CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.lit/orchard"), jingle->getInitiator());
CPPUNIT_ASSERT_EQUAL(std::string("a73sjjvkla37jfea"), jingle->getSessionID());
JingleFileTransferHash::ref hash = jingle->getPayload<JingleFileTransferHash>();
CPPUNIT_ASSERT(hash);
- CPPUNIT_ASSERT_EQUAL(std::string("552da749930852c69ae5d2141d3766b1"), hash->getHashes().at("sha-1"));
+ CPPUNIT_ASSERT_EQUAL(std::string("552da749930852c69ae5d2141d3766b1"), hash->getHashes().find("sha-1")->second);
}
// http://xmpp.org/extensions/xep-0234.html#example-10
void testParse_Xep0234_Example10() {
PayloadsParserTester parser;
CPPUNIT_ASSERT(parser.parse(
"<jingle xmlns='urn:xmpp:jingle:1'\n"
" action='session-initiate'\n"