diff options
| -rw-r--r-- | include/networkmanager.h | 3 | ||||
| -rw-r--r-- | src/networkmanager.cpp | 15 |
2 files changed, 4 insertions, 14 deletions
diff --git a/include/networkmanager.h b/include/networkmanager.h index f26e658c..08b10db8 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -50,9 +50,6 @@ public: // in seconds const int ms_reconnect_delay = 7; - // kind of arbitrary max buffer size - #define BUFFER_MAX_SIZE 16384 - bool ms_partial_packet = false; QString ms_temp_packet = ""; diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index 5b16db40..a9810d49 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -78,11 +78,8 @@ void NetworkManager::ship_server_packet(QString p_packet) void NetworkManager::handle_ms_packet() { - char buffer[BUFFER_MAX_SIZE]; - std::memset(buffer, 0, BUFFER_MAX_SIZE); - ms_socket->read(buffer, BUFFER_MAX_SIZE); - - QString in_data = buffer; + QByteArray buffer = ms_socket->readAll(); + QString in_data = QString::fromUtf8(buffer, buffer.size()); if (!in_data.endsWith("%")) { @@ -219,11 +216,8 @@ void NetworkManager::retry_ms_connect() void NetworkManager::handle_server_packet() { - char buffer[BUFFER_MAX_SIZE]; - std::memset(buffer, 0, BUFFER_MAX_SIZE); - server_socket->read(buffer, BUFFER_MAX_SIZE); - - QString in_data = buffer; + QByteArray buffer = server_socket->readAll(); + QString in_data = QString::fromUtf8(buffer, buffer.size()); if (!in_data.endsWith("%")) { @@ -251,4 +245,3 @@ void NetworkManager::handle_server_packet() ao_app->server_packet_received(f_packet); } } - |