Swiftdiff options
Diffstat (limited to 'Swiften/StreamManagement/StanzaAckRequester.cpp')
| -rw-r--r-- | Swiften/StreamManagement/StanzaAckRequester.cpp | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/Swiften/StreamManagement/StanzaAckRequester.cpp b/Swiften/StreamManagement/StanzaAckRequester.cpp index b60b9b0..c71803a 100644 --- a/Swiften/StreamManagement/StanzaAckRequester.cpp +++ b/Swiften/StreamManagement/StanzaAckRequester.cpp @@ -1,44 +1,42 @@ /* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. + * Copyright (c) 2010-2019 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. */ #include <Swiften/StreamManagement/StanzaAckRequester.h> -#include <boost/numeric/conversion/cast.hpp> -#include <iostream> - +#include <Swiften/Base/Log.h> #include <Swiften/Elements/Message.h> namespace Swift { -static const unsigned int MAX_HANDLED_STANZA_COUNT = boost::numeric_cast<unsigned int>((1ULL<<32) - 1); +static const unsigned int MAX_HANDLED_STANZA_COUNT = static_cast<unsigned int>((1ULL<<32) - 1); StanzaAckRequester::StanzaAckRequester() : lastHandledStanzasCount(0) { } -void StanzaAckRequester::handleStanzaSent(boost::shared_ptr<Stanza> stanza) { - unackedStanzas.push_back(stanza); - if (boost::dynamic_pointer_cast<Message>(stanza)) { - onRequestAck(); - } +void StanzaAckRequester::handleStanzaSent(std::shared_ptr<Stanza> stanza) { + unackedStanzas.push_back(stanza); + if (std::dynamic_pointer_cast<Message>(stanza)) { + onRequestAck(); + } } void StanzaAckRequester::handleAckReceived(unsigned int handledStanzasCount) { - unsigned int i = lastHandledStanzasCount; - while (i != handledStanzasCount) { - if (unackedStanzas.empty()) { - std::cerr << "Warning: Server acked more stanzas than we sent" << std::endl; - break; - } - boost::shared_ptr<Stanza> ackedStanza = unackedStanzas.front(); - unackedStanzas.pop_front(); - onStanzaAcked(ackedStanza); - i = (i == MAX_HANDLED_STANZA_COUNT ? 0 : i + 1); - } - lastHandledStanzasCount = handledStanzasCount; + unsigned int i = lastHandledStanzasCount; + while (i != handledStanzasCount) { + if (unackedStanzas.empty()) { + SWIFT_LOG(warning) << "Server acked more stanzas than we sent"; + break; + } + std::shared_ptr<Stanza> ackedStanza = unackedStanzas.front(); + unackedStanzas.pop_front(); + onStanzaAcked(ackedStanza); + i = (i == MAX_HANDLED_STANZA_COUNT ? 0 : i + 1); + } + lastHandledStanzasCount = handledStanzasCount; } } |