From e36c2b85678c944f82d3d3b49fee7f84e53b466e Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 31 Aug 2015 16:55:35 -0700 Subject: [PATCH 1/7] Remove extra curly brace --- libraries/networking/src/udt/Connection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index 368a6d459e..9101356fb1 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -844,7 +844,7 @@ void PendingReceivedMessage::enqueuePacket(std::unique_ptr packet) { // searching from the end of the list. auto it = find_if(_packets.rbegin(), _packets.rend(), [&](const std::unique_ptr& packet) { return sequenceNumber > packet->getSequenceNumber(); }); - } + _packets.insert(it.base(), std::move(packet)); if (_hasFirstSequenceNumber && _hasLastSequenceNumber) { From 12a1085530bddf2dde28620229fcbb5dabb9685b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 31 Aug 2015 17:30:02 -0700 Subject: [PATCH 2/7] Fix friend declaration in Socket from udt::UDTTest to UDTTest --- libraries/networking/src/udt/Socket.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/networking/src/udt/Socket.h b/libraries/networking/src/udt/Socket.h index 414f923901..262f548d2e 100644 --- a/libraries/networking/src/udt/Socket.h +++ b/libraries/networking/src/udt/Socket.h @@ -27,6 +27,8 @@ #define UDT_CONNECTION_DEBUG +class UDTTest; + namespace udt { class BasePacket; @@ -34,7 +36,6 @@ class ControlSender; class Packet; class PacketList; class SequenceNumber; -class UDTTest; using PacketFilterOperator = std::function; From 791652557eb32b1986c4a9fe28ae813a35f70870 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 31 Aug 2015 17:30:02 -0700 Subject: [PATCH 3/7] Fix friend declaration in Socket from udt::UDTTest to UDTTest --- libraries/networking/src/udt/Socket.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/udt/Socket.h b/libraries/networking/src/udt/Socket.h index 414f923901..923248caad 100644 --- a/libraries/networking/src/udt/Socket.h +++ b/libraries/networking/src/udt/Socket.h @@ -27,6 +27,8 @@ #define UDT_CONNECTION_DEBUG +class UDTTest; + namespace udt { class BasePacket; @@ -34,7 +36,6 @@ class ControlSender; class Packet; class PacketList; class SequenceNumber; -class UDTTest; using PacketFilterOperator = std::function; @@ -105,7 +106,7 @@ private: std::unique_ptr _ccFactory { new CongestionControlFactory() }; - friend class UDTTest; + friend UDTTest; }; } // namespace udt From 4824b38465b76364a304d7cb74b2b058fed2d096 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 1 Sep 2015 10:17:07 -0600 Subject: [PATCH 4/7] move UUID back to shared --- libraries/{networking => shared}/src/UUID.cpp | 0 libraries/{networking => shared}/src/UUID.h | 0 libraries/{networking => shared}/src/UUIDHasher.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename libraries/{networking => shared}/src/UUID.cpp (100%) rename libraries/{networking => shared}/src/UUID.h (100%) rename libraries/{networking => shared}/src/UUIDHasher.h (100%) diff --git a/libraries/networking/src/UUID.cpp b/libraries/shared/src/UUID.cpp similarity index 100% rename from libraries/networking/src/UUID.cpp rename to libraries/shared/src/UUID.cpp diff --git a/libraries/networking/src/UUID.h b/libraries/shared/src/UUID.h similarity index 100% rename from libraries/networking/src/UUID.h rename to libraries/shared/src/UUID.h diff --git a/libraries/networking/src/UUIDHasher.h b/libraries/shared/src/UUIDHasher.h similarity index 100% rename from libraries/networking/src/UUIDHasher.h rename to libraries/shared/src/UUIDHasher.h From be78d7f3aaa1e3234e7bcd1d9ad5db2da3703bc0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 1 Sep 2015 10:20:06 -0600 Subject: [PATCH 5/7] fix headers for move of UUID to shared --- libraries/networking/src/AddressManager.cpp | 3 ++- libraries/networking/src/DataServerAccountInfo.cpp | 3 ++- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/NLPacket.h | 3 ++- libraries/networking/src/NetworkPeer.cpp | 3 ++- libraries/networking/src/Node.cpp | 3 ++- libraries/networking/src/NodeList.cpp | 9 ++++++--- libraries/networking/src/WalletTransaction.cpp | 3 ++- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index ed4728ad78..f99e498ebf 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -18,11 +18,12 @@ #include #include +#include #include "AddressManager.h" #include "NodeList.h" #include "NetworkLogging.h" -#include "UUID.h" + const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index 0628e21574..5d633a8df1 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -16,7 +16,8 @@ #include #include -#include "UUID.h" +#include + #include "NetworkLogging.h" #include "DataServerAccountInfo.h" diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 2d1c98287c..d874921ada 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -26,11 +26,11 @@ #include #include #include +#include #include "AccountManager.h" #include "Assignment.h" #include "HifiSockAddr.h" -#include "UUID.h" #include "NetworkLogging.h" #include "udt/Packet.h" diff --git a/libraries/networking/src/NLPacket.h b/libraries/networking/src/NLPacket.h index b5d5fc0766..57ada84607 100644 --- a/libraries/networking/src/NLPacket.h +++ b/libraries/networking/src/NLPacket.h @@ -14,7 +14,8 @@ #include -#include "UUID.h" +#include + #include "udt/Packet.h" class NLPacket : public udt::Packet { diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index 0ffb87fe6c..b17656aea0 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -16,10 +16,11 @@ #include #include +#include #include "BandwidthRecorder.h" #include "NetworkLogging.h" -#include "UUID.h" + NetworkPeer::NetworkPeer(QObject* parent) : QObject(parent), diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 2b332d820d..5fea670dd0 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -12,9 +12,10 @@ #include #include +#include + #include "Node.h" #include "SharedUtil.h" -#include "UUID.h" #include #include diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index c4053a871b..cf202fa83a 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -9,6 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include "NodeList.h" + #include #include #include @@ -19,17 +21,18 @@ #include #include +#include #include "AccountManager.h" #include "AddressManager.h" #include "Assignment.h" #include "HifiSockAddr.h" #include "JSONBreakableMarshal.h" -#include "NodeList.h" + +#include "NetworkLogging.h" #include "udt/PacketHeaders.h" #include "SharedUtil.h" -#include "UUID.h" -#include "NetworkLogging.h" + NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned short dtlsListenPort) : LimitedNodeList(socketListenPort, dtlsListenPort), diff --git a/libraries/networking/src/WalletTransaction.cpp b/libraries/networking/src/WalletTransaction.cpp index 67fc73de07..0c823555fd 100644 --- a/libraries/networking/src/WalletTransaction.cpp +++ b/libraries/networking/src/WalletTransaction.cpp @@ -11,7 +11,8 @@ #include -#include "UUID.h" +#include + #include "WalletTransaction.h" From db92e3155cf3bbefd2c7e298933ca773244a32fc Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Sep 2015 09:39:30 -0700 Subject: [PATCH 6/7] Update AssetServerError enum to be camelcase --- assignment-client/src/assets/AssetServer.cpp | 6 +++--- assignment-client/src/assets/SendAssetTask.cpp | 8 ++++---- assignment-client/src/assets/UploadAssetTask.cpp | 4 ++-- libraries/networking/src/AssetResourceRequest.cpp | 2 +- libraries/networking/src/AssetUpload.cpp | 6 +++--- libraries/networking/src/AssetUtils.h | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 62f1b877b5..9d60b74508 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -113,11 +113,11 @@ void AssetServer::handleAssetGetInfo(QSharedPointer packet, SharedNode if (fileInfo.exists() && fileInfo.isReadable()) { qDebug() << "Opening file: " << fileInfo.filePath(); - replyPacket->writePrimitive(AssetServerError::NO_ERROR); + replyPacket->writePrimitive(AssetServerError::NoError); replyPacket->writePrimitive(fileInfo.size()); } else { qDebug() << "Asset not found: " << QString(hexHash); - replyPacket->writePrimitive(AssetServerError::ASSET_NOT_FOUND); + replyPacket->writePrimitive(AssetServerError::AssetNotFound); } auto nodeList = DependencyManager::get(); @@ -157,7 +157,7 @@ void AssetServer::handleAssetUpload(QSharedPointer packetList, Sha // write the message ID and a permission denied error permissionErrorPacket->writePrimitive(messageID); - permissionErrorPacket->writePrimitive(AssetServerError::PERMISSION_DENIED); + permissionErrorPacket->writePrimitive(AssetServerError::PermissionDenied); // send off the packet auto nodeList = DependencyManager::get(); diff --git a/assignment-client/src/assets/SendAssetTask.cpp b/assignment-client/src/assets/SendAssetTask.cpp index 8131bafaf3..1495a7b52e 100644 --- a/assignment-client/src/assets/SendAssetTask.cpp +++ b/assignment-client/src/assets/SendAssetTask.cpp @@ -55,7 +55,7 @@ void SendAssetTask::run() { replyPacketList->writePrimitive(messageID); if (end <= start) { - writeError(replyPacketList.get(), AssetServerError::INVALID_BYTE_RANGE); + writeError(replyPacketList.get(), AssetServerError::InvalidByteRange); } else { QString filePath = _resourcesDir.filePath(QString(hexHash) + "." + QString(extension)); @@ -63,12 +63,12 @@ void SendAssetTask::run() { if (file.open(QIODevice::ReadOnly)) { if (file.size() < end) { - writeError(replyPacketList.get(), AssetServerError::INVALID_BYTE_RANGE); + writeError(replyPacketList.get(), AssetServerError::InvalidByteRange); qCDebug(networking) << "Bad byte range: " << hexHash << " " << start << ":" << end; } else { auto size = end - start; file.seek(start); - replyPacketList->writePrimitive(AssetServerError::NO_ERROR); + replyPacketList->writePrimitive(AssetServerError::NoError); replyPacketList->writePrimitive(size); replyPacketList->write(file.read(size)); qCDebug(networking) << "Sending asset: " << hexHash; @@ -76,7 +76,7 @@ void SendAssetTask::run() { file.close(); } else { qCDebug(networking) << "Asset not found: " << filePath << "(" << hexHash << ")"; - writeError(replyPacketList.get(), AssetServerError::ASSET_NOT_FOUND); + writeError(replyPacketList.get(), AssetServerError::AssetNotFound); } } diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp index d4991f9554..1acca295b4 100644 --- a/assignment-client/src/assets/UploadAssetTask.cpp +++ b/assignment-client/src/assets/UploadAssetTask.cpp @@ -52,7 +52,7 @@ void UploadAssetTask::run() { replyPacket->writePrimitive(messageID); if (fileSize > MAX_UPLOAD_SIZE) { - replyPacket->writePrimitive(AssetServerError::ASSET_TOO_LARGE); + replyPacket->writePrimitive(AssetServerError::AssetTooLarge); } else { QByteArray fileData = buffer.read(fileSize); @@ -71,7 +71,7 @@ void UploadAssetTask::run() { file.write(fileData); file.close(); } - replyPacket->writePrimitive(AssetServerError::NO_ERROR); + replyPacket->writePrimitive(AssetServerError::NoError); replyPacket->write(hash); } diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index d27151ac53..1ec52bede6 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -52,7 +52,7 @@ void AssetResourceRequest::doSend() { _data = req->getData(); _result = Success; break; - case ASSET_NOT_FOUND: + case AssetNotFound: _result = NotFound; break; default: diff --git a/libraries/networking/src/AssetUpload.cpp b/libraries/networking/src/AssetUpload.cpp index 33d1dcc33a..14e5354f0b 100644 --- a/libraries/networking/src/AssetUpload.cpp +++ b/libraries/networking/src/AssetUpload.cpp @@ -43,13 +43,13 @@ void AssetUpload::start() { assetClient->uploadAsset(data, _extension, [this](AssetServerError error, const QString& hash){ switch (error) { - case NO_ERROR: + case AssetServerError::NoError: _result = Success; break; - case ASSET_TOO_LARGE: + case AssetServerError::AssetTooLarge: _result = TooLarge; break; - case PERMISSION_DENIED: + case AssetServerError::PermissionDenied: _result = PermissionDenied; break; default: diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h index ae6f51df64..de1083afa7 100644 --- a/libraries/networking/src/AssetUtils.h +++ b/libraries/networking/src/AssetUtils.h @@ -22,11 +22,11 @@ const size_t SHA256_HASH_HEX_LENGTH = 64; const uint64_t MAX_UPLOAD_SIZE = 1000 * 1000 * 1000; // 1GB enum AssetServerError : uint8_t { - NO_ERROR = 0, - ASSET_NOT_FOUND, - INVALID_BYTE_RANGE, - ASSET_TOO_LARGE, - PERMISSION_DENIED + NoError, + AssetNotFound, + InvalidByteRange, + AssetTooLarge, + PermissionDenied }; const QString ATP_SCHEME = "atp"; From 899b94eab3fcbe14d1c9164506229dc48222cb84 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Sep 2015 09:41:19 -0700 Subject: [PATCH 7/7] Add cstdint include to Asset* files --- libraries/networking/src/AssetClient.cpp | 2 ++ libraries/networking/src/AssetUpload.h | 2 ++ libraries/networking/src/AssetUtils.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp index 65806f3e96..dfa094ba78 100644 --- a/libraries/networking/src/AssetClient.cpp +++ b/libraries/networking/src/AssetClient.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include "AssetRequest.h" #include "AssetUpload.h" #include "NodeList.h" diff --git a/libraries/networking/src/AssetUpload.h b/libraries/networking/src/AssetUpload.h index a678c0dc7e..0fef814a07 100644 --- a/libraries/networking/src/AssetUpload.h +++ b/libraries/networking/src/AssetUpload.h @@ -16,6 +16,8 @@ #include +#include + // You should be able to upload an asset from any thread, and handle the responses in a safe way // on your own thread. Everything should happen on AssetClient's thread, the caller should // receive events by connecting to signals on an object that lives on AssetClient's threads. diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h index de1083afa7..7281678a10 100644 --- a/libraries/networking/src/AssetUtils.h +++ b/libraries/networking/src/AssetUtils.h @@ -14,6 +14,8 @@ #include +#include + using MessageID = uint32_t; using DataOffset = int64_t;