Modify transfer context

Author: dajimenezriv-internxt

dist/addon.node

@@ -6,12 +6,11 @@
 #include <string>
 #include "stdafx.h"
 #include <cfapi.h>
-#include "Logger.h"
 #include "Utilities.h"
 #include "Placeholders.h"
-#include "FileCopierWithProgress.h"
 
-struct TransferContext {
+struct TransferContext
+{
     CF_CONNECTION_KEY connectionKey;
     CF_TRANSFER_KEY transferKey;
     LARGE_INTEGER fileSize;
@@ -31,8 +30,6 @@ struct TransferContext {
     std::wstring fullServerFilePath;
 };
 
-std::shared_ptr<TransferContext> GetOrCreateTransferContext(
-    CF_CONNECTION_KEY connKey,
-    CF_TRANSFER_KEY transferKey);
-
+std::shared_ptr<TransferContext> CreateTransferContext(CF_TRANSFER_KEY transferKey);
+std::shared_ptr<TransferContext> GetTransferContext(CF_TRANSFER_KEY transferKey);
 void RemoveTransferContext(CF_TRANSFER_KEY transferKey);

include/sync_root_interface/TransferContext.h

@@ -345,8 +345,9 @@ void CALLBACK fetch_data_callback_wrapper(
 {
     Logger::getInstance().log("fetch_data_callback_wrapper called", LogLevel::DEBUG);
 
-    auto ctx = GetOrCreateTransferContext(callbackInfo->ConnectionKey, callbackInfo->TransferKey);
+    auto ctx = GetTransferContext(callbackInfo->TransferKey);
 
+    ctx->connectionKey = callbackInfo->ConnectionKey;
     ctx->fileSize        = callbackInfo->FileSize;
     ctx->requiredLength  = callbackParameters->FetchData.RequiredLength;
     ctx->requiredOffset  = callbackParameters->FetchData.RequiredFileOffset;

native-src/sync_root_interface/callbacks/FetchData/FetchData.cpp

@@ -1,7 +1,9 @@
-#include "TransferContext.h"
+#include <TransferContext.h>
 
-struct CfTransferKeyLess {
-    bool operator()(const CF_TRANSFER_KEY &a, const CF_TRANSFER_KEY &b) const {
+struct CfTransferKeyLess
+{
+    bool operator()(const CF_TRANSFER_KEY &a, const CF_TRANSFER_KEY &b) const
+    {
         return a.QuadPart < b.QuadPart;
     }
 };
@@ -10,22 +12,32 @@ static std::map<CF_TRANSFER_KEY, std::shared_ptr<TransferContext>, CfTransferKey
 
 static std::mutex g_contextMapMutex;
 
-std::shared_ptr<TransferContext> GetOrCreateTransferContext(CF_CONNECTION_KEY connKey, CF_TRANSFER_KEY transferKey) {
+std::shared_ptr<TransferContext> CreateTransferContext(CF_TRANSFER_KEY transferKey)
+{
     std::lock_guard<std::mutex> lock(g_contextMapMutex);
 
-    auto it = g_transferContextMap.find(transferKey);
-    if (it != g_transferContextMap.end()) {
-        return it->second;
-    }
-    
     auto ctx = std::make_shared<TransferContext>();
-    ctx->connectionKey = connKey;
     ctx->transferKey = transferKey;
+
     g_transferContextMap[transferKey] = ctx;
     return ctx;
 }
 
-void RemoveTransferContext(CF_TRANSFER_KEY transferKey)  {
+std::shared_ptr<TransferContext> GetTransferContext(CF_TRANSFER_KEY transferKey)
+{
+    std::lock_guard<std::mutex> lock(g_contextMapMutex);
+
+    auto it = g_transferContextMap.find(transferKey);
+    if (it != g_transferContextMap.end())
+    {
+        return it->second;
+    }
+
+    return nullptr;
+}
+
+void RemoveTransferContext(CF_TRANSFER_KEY transferKey)
+{
     std::lock_guard<std::mutex> lock(g_contextMapMutex);
     g_transferContextMap.erase(transferKey);
 }