瀏覽代碼

HPCC-25531 Roxie decryption should be moved off socket reader thread

Fix mismerge

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 年之前
父節點
當前提交
77dc0cfb0c
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      roxie/udplib/udpmsgpk.cpp
  2. 1 1
      roxie/udplib/udptrr.cpp

+ 2 - 0
roxie/udplib/udpmsgpk.cpp

@@ -246,6 +246,8 @@ public:
             // MORE - This is decrypting in-place. Is that ok?? Seems to be with the code we currently use, but if that changed
             // might need to rethink this
             size_t decryptedSize = aesDecrypt(key, sizeof(key), pktHdr+1, pktHdr->length-sizeof(UdpPacketHeader), pktHdr+1, DATA_PAYLOAD-sizeof(UdpPacketHeader));
+            if (checkTraceLevel(TRACE_MSGPACK, 5))
+                DBGLOG("Decrypted %u bytes at %p resulting in %u bytes", (unsigned) (pktHdr->length-sizeof(UdpPacketHeader)), pktHdr+1, (unsigned) decryptedSize);
             pktHdr->length = decryptedSize + sizeof(UdpPacketHeader);
         }
 

+ 1 - 1
roxie/udplib/udptrr.cpp

@@ -742,7 +742,7 @@ class CReceiveManager : implements IReceiveManager, public CInterface
   public:
     IMPLEMENT_IINTERFACE;
     CReceiveManager(int server_flow_port, int d_port, int client_flow_port, int queue_size, int m_slot_pr_client, bool _encrypted)
-        : collatorThread(*this), sendersTable([client_flow_port](const ServerIdentifier ip) { return new UdpSenderEntry(ip.getIpAddress(), client_flow_port);})
+        : collatorThread(*this), encrypted(_encrypted), sendersTable([client_flow_port](const ServerIdentifier ip) { return new UdpSenderEntry(ip.getIpAddress(), client_flow_port);})
     {
 #ifndef _WIN32
         setpriority(PRIO_PROCESS, 0, -15);