Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in deserializePacket()

Browse Source
This commit is contained in:
Kayne Ruse
2014-11-26 07:51:24 +11:00
parent 01461deaa5
commit 584b6ea303
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/network/serial_utility.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
SerialPacketType type; SerialPacketType type;
memcpy(&type, buffer, sizeof(SerialPacketType)); memcpy(&type, buffer, sizeof(SerialPacketType));
switch(packet->type) { switch(type) {
case SerialPacketType::PING: case SerialPacketType::PING:
case SerialPacketType::PONG: case SerialPacketType::PONG:
case SerialPacketType::BROADCAST_REQUEST: case SerialPacketType::BROADCAST_REQUEST:
server/server_logic.cpp
+9 -1
View File
@@ -163,10 +163,18 @@ void ServerApplication::Init(int argc, char* argv[]) {
void ServerApplication::Proc() { void ServerApplication::Proc() {
SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]); SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
memset(packetBuffer, 0, MAX_PACKET_SIZE); //zero the buffer
while(running) { while(running) {
//suck in the waiting packets & process them //suck in the waiting packets & process them
while(UDPNetworkUtility::GetSingleton().Receive(packetBuffer)) { while(UDPNetworkUtility::GetSingleton().Receive(packetBuffer)) {
HandlePacket(packetBuffer); try {
HandlePacket(packetBuffer);
}
catch(std::exception& e) {
std::cerr << "HandlePacket Error: " << e.what() << std::endl;
}
memset(packetBuffer, 0, MAX_PACKET_SIZE); //reset the buffer
} }
//update the internals //update the internals
//... //...