marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use uint8_t consistently for UDP status packet byte 

Thanks to pkern for spotting this.
stable-5.3
Peter Wortmann 2012-11-17 17:40:00 +00:00
parent 18839efc23
commit 4a3a6e5260
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/C4NetIO.cpp
View File

@ -1739,7 +1739,7 @@ const unsigned int C4NetIOUDP::iUDPHeaderSize = 8 + 24; // (bytes)
// packet structures
struct C4NetIOUDP::PacketHdr
{
int8_t StatusByte;
uint8_t StatusByte;
uint32_t Nr; // packet nr
};
@ -2171,7 +2171,7 @@ void C4NetIOUDP::OnPacket(const C4NetIOPacket &Packet, C4NetIO *pNetIO)
// ping? answer without creating a connection
if ((Packet.getStatus() & 0x7F) == IPID_Ping)
{
PacketHdr PingPacket = { int8_t(IPID_Ping | (Packet.getStatus() & 0x80)), 0 };
PacketHdr PingPacket = { uint8_t(IPID_Ping | (Packet.getStatus() & 0x80)), 0 };
SendDirect(C4NetIOPacket(&PingPacket, sizeof(PingPacket), false, Packet.getAddr()));
return;
}
@ -3001,7 +3001,7 @@ bool C4NetIOUDP::DoLoopbackTest()
if (!C4NetIOSimpleUDP::getMCLoopback()) return false;
// send test packet
const PacketHdr TestPacket = { IPID_Test | char(0x80), static_cast<uint32_t>(rand()) };
const PacketHdr TestPacket = { uint8_t(IPID_Test | 0x80), static_cast<uint32_t>(rand()) };
if (!C4NetIOSimpleUDP::Broadcast(C4NetIOPacket(&TestPacket, sizeof(TestPacket))))
return false;
@ -3131,7 +3131,7 @@ void C4NetIOUDP::DoCheck() // (mt-safe)
{
// set up packet
CheckPacketHdr Pkt;
Pkt.StatusByte = IPID_Check | char(0x80);
Pkt.StatusByte = uint8_t(IPID_Check | 0x80);
Pkt.Nr = iOPacketCounter;
Pkt.AskCount = Pkt.MCAskCount = 0;
// send it