Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

All (de)serializations return size_t instead of unsigned int (Should fix compilation on x64)

Browse source 
Commit missing unit test file.
This commit is contained in:
joris 2013-04-12 15:58:50 +02:00
parent b9b8ad8c82
commit 4ae820929a
3 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/include/net_message.h
View file

@ -331,8 +331,8 @@ public:
CNetworkCommand() : Unit(0), X(0), Y(0), Dest(0) {}
void Clear() { this->Unit = this->X = this->Y = this->Dest = 0; }
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 2 + 2 + 2 + 2; }
public:
@ -350,8 +350,8 @@ class CNetworkExtendedCommand
public:
CNetworkExtendedCommand() : ExtendedType(0), Arg1(0), Arg2(0), Arg3(0), Arg4(0) {}
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 1 + 1 + 2 + 2 + 2; }
uint8_t ExtendedType; /// Extended network command type
@ -367,8 +367,8 @@ public:
class CNetworkChat
{
public:
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
size_t Size() const;
public:
@ -382,8 +382,8 @@ class CNetworkCommandSync
{
public:
CNetworkCommandSync() : syncSeed(0), syncHash(0) {}
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 4 + 4; };
public:
@ -398,8 +398,8 @@ class CNetworkCommandQuit
{
public:
CNetworkCommandQuit() : player(0) {}
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 2; };
public:
@ -414,8 +414,8 @@ class CNetworkSelection
public:
CNetworkSelection() : player(0) {}
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
size_t Size() const;
public:
@ -436,8 +436,8 @@ public:
memset(Type, 0, sizeof(Type));
}
unsigned int Serialize(unsigned char *buf) const;
unsigned int Deserialize(const unsigned char *buf);
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 1 + 1 * MaxNetworkCommands; }
uint8_t Type[MaxNetworkCommands]; /// Commands in packet
@ -452,7 +452,7 @@ public:
class CNetworkPacket
{
public:
unsigned int Serialize(unsigned char *buf, int numcommands) const;
size_t Serialize(unsigned char *buf, int numcommands) const;
void Deserialize(const unsigned char *buf, unsigned int len, int *numcommands);
size_t Size(int numcommands) const;

70
src/network/net_message.cpp
View file

@ -42,42 +42,42 @@
#include "network.h"
#include "version.h"
unsigned int serialize32(unsigned char *buf, uint32_t data)
size_t serialize32(unsigned char *buf, uint32_t data)
{
if (buf) {
*reinterpret_cast<uint32_t *>(buf) = htonl(data);
}
return sizeof(data);
}
unsigned int serialize32(unsigned char *buf, int32_t data)
size_t serialize32(unsigned char *buf, int32_t data)
{
if (buf) {
*reinterpret_cast<int32_t *>(buf) = htonl(data);
}
return sizeof(data);
}
unsigned int serialize16(unsigned char *buf, uint16_t data)
size_t serialize16(unsigned char *buf, uint16_t data)
{
if (buf) {
*reinterpret_cast<uint16_t *>(buf) = htons(data);
}
return sizeof(data);
}
unsigned int serialize16(unsigned char *buf, int16_t data)
size_t serialize16(unsigned char *buf, int16_t data)
{
if (buf) {
*reinterpret_cast<int16_t *>(buf) = htons(data);
}
return sizeof(data);
}
unsigned int serialize8(unsigned char *buf, uint8_t data)
size_t serialize8(unsigned char *buf, uint8_t data)
{
if (buf) {
*buf = data;
}
return sizeof(data);
}
unsigned int serialize8(unsigned char *buf, int8_t data)
size_t serialize8(unsigned char *buf, int8_t data)
{
if (buf) {
*buf = data;
@ -85,14 +85,14 @@ unsigned int serialize8(unsigned char *buf, int8_t data)
return sizeof(data);
}
template <int N>
unsigned int serialize(unsigned char *buf, const char(&data)[N])
size_t serialize(unsigned char *buf, const char(&data)[N])
{
if (buf) {
memcpy(buf, data, N);
}
return N;
}
unsigned int serialize(unsigned char *buf, const std::string &s)
size_t serialize(unsigned char *buf, const std::string &s)
{
if (buf) {
buf += serialize16(buf, uint16_t(s.size()));
@ -104,7 +104,7 @@ unsigned int serialize(unsigned char *buf, const std::string &s)
}
return 2 + ((s.size() + 3) & ~0x03); // round up to multiple of 4 for alignment.
}
unsigned int serialize(unsigned char *buf, const std::vector<unsigned char> &data)
size_t serialize(unsigned char *buf, const std::vector<unsigned char> &data)
{
if (buf) {
if (data.empty()) {
@ -120,43 +120,43 @@ unsigned int serialize(unsigned char *buf, const std::vector<unsigned char> &dat
return 2 + ((data.size() + 3) & ~0x03); // round up to multiple of 4 for alignment.
}
unsigned int deserialize32(const unsigned char *buf, uint32_t *data)
size_t deserialize32(const unsigned char *buf, uint32_t *data)
{
*data = ntohl(*reinterpret_cast<const uint32_t *>(buf));
return sizeof(*data);
}
unsigned int deserialize32(const unsigned char *buf, int32_t *data)
size_t deserialize32(const unsigned char *buf, int32_t *data)
{
*data = ntohl(*reinterpret_cast<const int32_t *>(buf));
return sizeof(*data);
}
unsigned int deserialize16(const unsigned char *buf, uint16_t *data)
size_t deserialize16(const unsigned char *buf, uint16_t *data)
{
*data = ntohs(*reinterpret_cast<const uint16_t *>(buf));
return sizeof(*data);
}
unsigned int deserialize16(const unsigned char *buf, int16_t *data)
size_t deserialize16(const unsigned char *buf, int16_t *data)
{
*data = ntohs(*reinterpret_cast<const int16_t *>(buf));
return sizeof(*data);
}
unsigned int deserialize8(const unsigned char *buf, uint8_t *data)
size_t deserialize8(const unsigned char *buf, uint8_t *data)
{
*data = *buf;
return sizeof(*data);
}
unsigned int deserialize8(const unsigned char *buf, int8_t *data)
size_t deserialize8(const unsigned char *buf, int8_t *data)
{
*data = *buf;
return sizeof(*data);
}
template <int N>
unsigned int deserialize(const unsigned char *buf, char(&data)[N])
size_t deserialize(const unsigned char *buf, char(&data)[N])
{
memcpy(data, buf, N);
return N;
}
unsigned int deserialize(const unsigned char *buf, std::string &s)
size_t deserialize(const unsigned char *buf, std::string &s)
{
uint16_t size;
@ -164,7 +164,7 @@ unsigned int deserialize(const unsigned char *buf, std::string &s)
s = std::string(reinterpret_cast<const char *>(buf), size);
return 2 + ((s.size() + 3) & ~0x03); // round up to multiple of 4 for alignment.
}
unsigned int deserialize(const unsigned char *buf, std::vector<unsigned char> &data)
size_t deserialize(const unsigned char *buf, std::vector<unsigned char> &data)
{
uint16_t size;
@ -554,7 +554,7 @@ void CInitMessage_Resync::Deserialize(const unsigned char *p)
// CNetworkCommand
//
unsigned int CNetworkCommand::Serialize(unsigned char *buf) const
size_t CNetworkCommand::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
p += serialize16(p, this->Unit);
@ -564,7 +564,7 @@ unsigned int CNetworkCommand::Serialize(unsigned char *buf) const
return p - buf;
}
unsigned int CNetworkCommand::Deserialize(const unsigned char *buf)
size_t CNetworkCommand::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
p += deserialize16(p, &this->Unit);
@ -578,7 +578,7 @@ unsigned int CNetworkCommand::Deserialize(const unsigned char *buf)
// CNetworkExtendedCommand
//
unsigned int CNetworkExtendedCommand::Serialize(unsigned char *buf) const
size_t CNetworkExtendedCommand::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
p += serialize8(p, this->ExtendedType);
@ -589,7 +589,7 @@ unsigned int CNetworkExtendedCommand::Serialize(unsigned char *buf) const
return p - buf;
}
unsigned int CNetworkExtendedCommand::Deserialize(const unsigned char *buf)
size_t CNetworkExtendedCommand::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
p += deserialize8(p, &this->ExtendedType);
@ -604,23 +604,23 @@ unsigned int CNetworkExtendedCommand::Deserialize(const unsigned char *buf)
// CNetworkChat
//
unsigned int CNetworkChat::Serialize(unsigned char *buf) const
size_t CNetworkChat::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
p += serialize(p, this->Text);
return p - buf;
}
unsigned int CNetworkChat::Deserialize(const unsigned char *buf)
size_t CNetworkChat::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
p += deserialize(p, this->Text);
return p - buf;
}
unsigned int CNetworkChat::Size() const
size_t CNetworkChat::Size() const
{
unsigned int size = 0;
size_t size = 0;
size += serialize(NULL, this->Text);
return size;
}
@ -629,7 +629,7 @@ unsigned int CNetworkChat::Size() const
// CNetworkCommandSync
//
unsigned int CNetworkCommandSync::Serialize(unsigned char *buf) const
size_t CNetworkCommandSync::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
p += serialize32(p, this->syncSeed);
@ -637,7 +637,7 @@ unsigned int CNetworkCommandSync::Serialize(unsigned char *buf) const
return p - buf;
}
unsigned int CNetworkCommandSync::Deserialize(const unsigned char *buf)
size_t CNetworkCommandSync::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
p += deserialize32(p, &this->syncSeed);
@ -649,14 +649,14 @@ unsigned int CNetworkCommandSync::Deserialize(const unsigned char *buf)
// CNetworkCommandQuit
//
unsigned int CNetworkCommandQuit::Serialize(unsigned char *buf) const
size_t CNetworkCommandQuit::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
p += serialize16(p, this->player);
return p - buf;
}
unsigned int CNetworkCommandQuit::Deserialize(const unsigned char *buf)
size_t CNetworkCommandQuit::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
p += deserialize16(p, &this->player);
@ -667,7 +667,7 @@ unsigned int CNetworkCommandQuit::Deserialize(const unsigned char *buf)
// CNetworkSelection
//
unsigned int CNetworkSelection::Serialize(unsigned char *buf) const
size_t CNetworkSelection::Serialize(unsigned char *buf) const
{
unsigned char *p = buf;
@ -679,7 +679,7 @@ unsigned int CNetworkSelection::Serialize(unsigned char *buf) const
return p - buf;
}
unsigned int CNetworkSelection::Deserialize(const unsigned char *buf)
size_t CNetworkSelection::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
@ -702,7 +702,7 @@ size_t CNetworkSelection::Size() const
// CNetworkPacketHeader
//
unsigned int CNetworkPacketHeader::Serialize(unsigned char *p) const
size_t CNetworkPacketHeader::Serialize(unsigned char *p) const
{
if (p != NULL) {
for (int i = 0; i != MaxNetworkCommands; ++i) {
@ -713,7 +713,7 @@ unsigned int CNetworkPacketHeader::Serialize(unsigned char *p) const
return MaxNetworkCommands + 1;
}
unsigned int CNetworkPacketHeader::Deserialize(const unsigned char *buf)
size_t CNetworkPacketHeader::Deserialize(const unsigned char *buf)
{
const unsigned char *p = buf;
@ -746,7 +746,7 @@ void CNetworkPacket::Deserialize(const unsigned char *p, unsigned int len, int *
len -= CNetworkPacketHeader::Size();
for (*commandCount = 0; len != 0; ++*commandCount) {
const unsigned int r = deserialize(p, this->Command[*commandCount]);
const size_t r = deserialize(p, this->Command[*commandCount]);
p += r;
len -= r;
}

2
tests/network/test_netconnect.cpp
View file

@ -100,7 +100,7 @@ void FillCustomValue(CInitMessage_ProtocolMismatch *obj)
void FillCustomValue(CInitMessage_Welcome *obj)
{
obj->Lag = 0x01020304;
obj->Updates = 0x05060708;
obj->gameCyclesPerUpdate = 0x05060708;
for (int i = 0; i != PlayerMax; ++i) {
FillCustomValue(&obj->hosts[i]);
}