GabrielTofvesson/CPPTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted the read buffer to a vector such that it resizes as necessary

Browse Source 
Increased maximum read buffer size to 1 GiB
This commit is contained in:
Gabriel Tofvesson 2017-10-03 16:52:39 +02:00
parent e399fcb5cb
commit d8ee17c011
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CPPTools/Net.cpp
View File

@ -48,6 +48,7 @@ namespace IO {
packets = new std::vector<Packet>(); packets = new std::vector<Packet>();
sparse = new std::vector<char>(); sparse = new std::vector<char>();
outPacketBuf = new std::vector<Packet>(); outPacketBuf = new std::vector<Packet>();
rBuf.resize(1);
_open = true; _open = true;
canWrite = true; canWrite = true;
evt = nullptr; evt = nullptr;
@ -211,7 +212,8 @@ namespace IO {
rdErr = ioctlsocket(_socket, FIONREAD, &rCount); rdErr = ioctlsocket(_socket, FIONREAD, &rCount);
if (rdErr == SOCKET_ERROR) throw new _exception(); // Error using socket :( if (rdErr == SOCKET_ERROR) throw new _exception(); // Error using socket :(
if (rCount > 0) { if (rCount > 0) {
iResult = recv(_socket, rBuf, BUFSIZE, 0); rBuf.resize(rCount);
iResult = recv(_socket, &rBuf[0], rCount, 0);
if (iResult > 0) if (iResult > 0)
for (int i = 0; i < iResult; ++i) for (int i = 0; i < iResult; ++i)
if (sparse->size() < BUF_2_MAX) if (sparse->size() < BUF_2_MAX)

7
CPPTools/Net.h
View File

@ -8,8 +8,8 @@
#define BUFSIZE 512 #define BUFSIZE 512
#define BUF_2_MAX 2048 #define BUF_2_MAX 2048
#else #else
#define BUFSIZE 16384 #define BUFSIZE 1073741824 // 1 GiB
#define BUF_2_MAX 16384 #define BUF_2_MAX 1073741824 // 1 GiB
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -44,7 +44,8 @@ namespace IO {
volatile bool _open; // Whether or not connection is open volatile bool _open; // Whether or not connection is open
bool canWrite; // Whether or not writing to peer is possible 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 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<char> rBuf;
CryptoLevel preferEncrypted = CryptoLevel::None;// Whether or not the socket should attempt to request an encrypted channel 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 encrypted = false; // Whether or not negotiation determined the use of an encrypted channel
bool firstMessage = true; // Whether or not negotiation has yet ocurred bool firstMessage = true; // Whether or not negotiation has yet ocurred