sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing missing htonl/ntohl with QtNetwork.

Browse Source
This commit is contained in:
lotodore
2013-08-29 23:10:16 +02:00
parent 1f0bf411b4
commit e95557f80d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chatcleaner/cleanerserver.cpp
+3 -3
View File
@@ -32,11 +32,11 @@
#include <QtNetwork> #include <QtNetwork>
#include <QtCore> #include <QtCore>
#include <QtEndian>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <third_party/protobuf/chatcleaner.pb.h> #include <third_party/protobuf/chatcleaner.pb.h>
#include "messagefilter.h" #include "messagefilter.h"
#include "cleanerconfig.h" #include "cleanerconfig.h"
@@ -101,7 +101,7 @@ void CleanerServer::onRead()
// Read the size of the packet (first 4 bytes in network byte order). // Read the size of the packet (first 4 bytes in network byte order).
uint32_t nativeVal; uint32_t nativeVal;
memcpy(&nativeVal, &m_recvBuf[0], sizeof(uint32_t)); memcpy(&nativeVal, &m_recvBuf[0], sizeof(uint32_t));
size_t packetSize = ntohl(nativeVal); size_t packetSize = qFromBigEndian(nativeVal);
if (packetSize > MAX_CLEANER_PACKET_SIZE) { if (packetSize > MAX_CLEANER_PACKET_SIZE) {
m_recvBufUsed = 0; m_recvBufUsed = 0;
qDebug() << "Invalid packet size: " << packetSize; qDebug() << "Invalid packet size: " << packetSize;
@@ -227,7 +227,7 @@ void CleanerServer::sendMessageToClient(ChatCleanerMessage &msg)
{ {
uint32_t packetSize = msg.ByteSize(); uint32_t packetSize = msg.ByteSize();
google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize + CLEANER_NET_HEADER_SIZE]; google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize + CLEANER_NET_HEADER_SIZE];
*((uint32_t *)buf) = htonl(packetSize); *((uint32_t *)buf) = qToBigEndian(packetSize);
msg.SerializeWithCachedSizesToArray(&buf[CLEANER_NET_HEADER_SIZE]); msg.SerializeWithCachedSizesToArray(&buf[CLEANER_NET_HEADER_SIZE]);
tcpSocket->write((const char *)buf, packetSize + CLEANER_NET_HEADER_SIZE); tcpSocket->write((const char *)buf, packetSize + CLEANER_NET_HEADER_SIZE);
delete[] buf; delete[] buf;