From ca4a06a8506dca3fb868b1eec497c67a6940678d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Jul 2004 19:24:09 +0000 Subject: [PATCH] only use ntoh*/hton* for filling in BSD sockets data structures; use our own byte swaps for other use more type fixes --- stepmania/src/NetworkSyncManager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index e500d9166f..5c35885a69 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -360,10 +360,10 @@ uint16_t NetworkSyncManager::Read2(NetPacket &Packet) if (Packet.Position>=NETMAXBUFFERSIZE-1) return 0; - unsigned short int Temp; + uint16_t Temp; memcpy( &Temp, *(&Packet.Data + Packet.Position),2 ); Packet.Position+=2; - return ntohs(Temp); + return Swap16BE(Temp); } uint32_t NetworkSyncManager::Read4(NetPacket &Packet) @@ -371,10 +371,10 @@ uint32_t NetworkSyncManager::Read4(NetPacket &Packet) if (Packet.Position>=NETMAXBUFFERSIZE-3) return 0; - unsigned int Temp; + uint32_t Temp; memcpy( &Temp, (&Packet.Data + Packet.Position),4 ); Packet.Position+=2; - return ntohl(Temp); + return Swap32BE(Temp); } CString NetworkSyncManager::ReadNT(NetPacket &Packet) @@ -401,7 +401,7 @@ void NetworkSyncManager::Write2(NetPacket &Packet, uint16_t Data) { if (Packet.Position>=NETMAXBUFFERSIZE-1) return; - Data = htons(Data); + Data = Swap16BE(Data); memcpy( &Packet.Data[Packet.Position], &Data,2 ); Packet.Position+=2; } @@ -411,8 +411,8 @@ void NetworkSyncManager::Write4(NetPacket &Packet, uint32_t Data) if (Packet.Position>=NETMAXBUFFERSIZE-3) return ; - Data = htonl(Data); - memcpy( (&Packet.Data[Packet.Position]), &Data,4 ); + Data = Swap32BE(Data); + memcpy( &Packet.Data[Packet.Position], &Data,4 ); Packet.Position+=4; }