From 7eabee38adeb3d2f7fcf9e536bdd11ed7e2b99b8 Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Wed, 27 Sep 2023 15:44:56 -0400 Subject: [PATCH] Cleanup --- SQCSim-common/netprotocol.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/SQCSim-common/netprotocol.cpp b/SQCSim-common/netprotocol.cpp index 5e95427..fef687c 100644 --- a/SQCSim-common/netprotocol.cpp +++ b/SQCSim-common/netprotocol.cpp @@ -18,14 +18,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) { void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) { *buf[0] = netprot::PACKET_TYPE::LOGINF; - char* buff = *buf + 1; - size_t namesize = 1; - - for (int x = 0; x < sizeof(linfo->name); ++x) - if (linfo->name[x] != (char)'\0') - ++namesize; - else break; + size_t namesize = std::strlen(linfo->name) + 1; memcpy(*buf + 1, &linfo->name, namesize); uint64_t sid = linfo->sid; @@ -40,8 +34,7 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) { sid & 0xFF }; - char* ptrsid = *buf + namesize + 2; - memcpy(ptrsid, diff, sizeof(uint64_t)); + memcpy(*buf + namesize + 2, diff, sizeof(uint64_t)); *buflen = namesize + sizeof(uint64_t) + 2; } @@ -88,14 +81,12 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) { if (buflen < sizeof(LoginInfo) + 3) return false; - size_t namesize = 1; + size_t namesize = std::strlen(buf) + 1; - for (int x = 0; x < sizeof(linfo->name); ++x) - if (buf[x] != (char)'\0') - ++namesize; - else break; + if (namesize > 32) + return false; - memcpy((void*)&linfo->name, (void*)&buf[1], namesize); + memcpy(&linfo->name, &buf[1], namesize); uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 }; memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));