diff options
Diffstat (limited to 'src/Net/Packet.cpp')
-rw-r--r-- | src/Net/Packet.cpp | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/Net/Packet.cpp b/src/Net/Packet.cpp index 976fd65..a4e1b89 100644 --- a/src/Net/Packet.cpp +++ b/src/Net/Packet.cpp @@ -22,12 +22,10 @@ namespace Mad { namespace Net { -Packet::Packet(Type type, uint16_t requestId, const void *data, uint16_t length) { +Packet::Packet(uint16_t requestId, const void *data, uint16_t length) { rawData = (Data*)std::malloc(sizeof(Data)+length); - rawData->type = htons(type); rawData->requestId = htons(requestId); - rawData->reserved = 0; rawData->length = htons(length); if(length) @@ -46,29 +44,5 @@ Packet& Packet::operator=(const Packet &p) { return *this; } - -uint64_t Packet::htonll(uint64_t val) { - union { - uint32_t u32[2]; - uint64_t u64; - } ret; - - ret.u32[0] = htonl(val >> 32); - ret.u32[1] = htonl(val); - - return ret.u64; -} - -uint64_t Packet::ntohll(uint64_t val) { - union { - uint32_t u32[2]; - uint64_t u64; - } v; - - v.u64 = val; - - return (((uint64_t)ntohl(v.u32[0])) << 32) | ntohl(v.u32[1]); -} - } } |