Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
oldmud0 2018-07-05 21:06:02 -05:00
commit a7c63a44c6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
networkmanager.cpp
View File

@ -4,6 +4,7 @@
#include "debug_functions.h"
#include "lobby.h"
#include <cstring>
NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
{
@ -80,8 +81,9 @@ void NetworkManager::ship_server_packet(QString p_packet)
void NetworkManager::handle_ms_packet()
{
char buffer[16384] = {0};
ms_socket->read(buffer, ms_socket->bytesAvailable());
char buffer[buffer_max_size];
std::memset(buffer, 0, buffer_max_size);
ms_socket->read(buffer, buffer_max_size);
QString in_data = buffer;
@ -218,8 +220,9 @@ void NetworkManager::retry_ms_connect()
void NetworkManager::handle_server_packet()
{
char buffer[16384] = {0};
server_socket->read(buffer, server_socket->bytesAvailable());
char buffer[buffer_max_size];
std::memset(buffer, 0, buffer_max_size);
server_socket->read(buffer, buffer_max_size);
QString in_data = buffer;

3
networkmanager.h
View File

@ -48,6 +48,9 @@ public:
const int ms_reconnect_delay_ms = 7000;
// kind of arbitrary max buffer size
const size_t buffer_max_size = 16384;
bool ms_partial_packet = false;
QString ms_temp_packet = "";