From d8ee17c011a602a8c1b97068facea9ef1b65184c Mon Sep 17 00:00:00 2001 From: FuckYou Date: Tue, 3 Oct 2017 16:52:39 +0200 Subject: [PATCH] Converted the read buffer to a vector such that it resizes as necessary Increased maximum read buffer size to 1 GiB --- CPPTools/Net.cpp | 4 +++- CPPTools/Net.h | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CPPTools/Net.cpp b/CPPTools/Net.cpp index 0dd2976..11af9d9 100644 --- a/CPPTools/Net.cpp +++ b/CPPTools/Net.cpp @@ -48,6 +48,7 @@ namespace IO { packets = new std::vector(); sparse = new std::vector(); outPacketBuf = new std::vector(); + rBuf.resize(1); _open = true; canWrite = true; evt = nullptr; @@ -211,7 +212,8 @@ namespace IO { rdErr = ioctlsocket(_socket, FIONREAD, &rCount); if (rdErr == SOCKET_ERROR) throw new _exception(); // Error using socket :( if (rCount > 0) { - iResult = recv(_socket, rBuf, BUFSIZE, 0); + rBuf.resize(rCount); + iResult = recv(_socket, &rBuf[0], rCount, 0); if (iResult > 0) for (int i = 0; i < iResult; ++i) if (sparse->size() < BUF_2_MAX) diff --git a/CPPTools/Net.h b/CPPTools/Net.h index 9269be5..550168b 100644 --- a/CPPTools/Net.h +++ b/CPPTools/Net.h @@ -8,8 +8,8 @@ #define BUFSIZE 512 #define BUF_2_MAX 2048 #else -#define BUFSIZE 16384 -#define BUF_2_MAX 16384 +#define BUFSIZE 1073741824 // 1 GiB +#define BUF_2_MAX 1073741824 // 1 GiB #endif #define WIN32_LEAN_AND_MEAN @@ -44,7 +44,8 @@ namespace IO { volatile bool _open; // Whether or not connection is open bool canWrite; // Whether or not writing to peer is possible bool noThread; // Whether or not reading incoming data should be / is being done in a separate thread - char rBuf[BUFSIZE]; // Recieve buffer + //char rBuf[BUFSIZE]; // Recieve buffer + std::vector rBuf; CryptoLevel preferEncrypted = CryptoLevel::None;// Whether or not the socket should attempt to request an encrypted channel bool encrypted = false; // Whether or not negotiation determined the use of an encrypted channel bool firstMessage = true; // Whether or not negotiation has yet ocurred