actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

only use ntoh*/hton* for filling in BSD sockets data structures; use our

Browse Source 
own byte swaps for other use
more type fixes
This commit is contained in:
Glenn Maynard
2004-07-07 19:24:09 +00:00
parent f0988ea8f4
commit ca4a06a850
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncManager.cpp
+7 -7
View File
@@ -360,10 +360,10 @@ uint16_t NetworkSyncManager::Read2(NetPacket &Packet)
if (Packet.Position>=NETMAXBUFFERSIZE-1) if (Packet.Position>=NETMAXBUFFERSIZE-1)
return 0; return 0;
unsigned short int Temp; uint16_t Temp;
memcpy( &Temp, *(&Packet.Data + Packet.Position),2 ); memcpy( &Temp, *(&Packet.Data + Packet.Position),2 );
Packet.Position+=2; Packet.Position+=2;
return ntohs(Temp); return Swap16BE(Temp);
} }
uint32_t NetworkSyncManager::Read4(NetPacket &Packet) uint32_t NetworkSyncManager::Read4(NetPacket &Packet)
@@ -371,10 +371,10 @@ uint32_t NetworkSyncManager::Read4(NetPacket &Packet)
if (Packet.Position>=NETMAXBUFFERSIZE-3) if (Packet.Position>=NETMAXBUFFERSIZE-3)
return 0; return 0;
unsigned int Temp; uint32_t Temp;
memcpy( &Temp, (&Packet.Data + Packet.Position),4 ); memcpy( &Temp, (&Packet.Data + Packet.Position),4 );
Packet.Position+=2; Packet.Position+=2;
return ntohl(Temp); return Swap32BE(Temp);
} }
CString NetworkSyncManager::ReadNT(NetPacket &Packet) CString NetworkSyncManager::ReadNT(NetPacket &Packet)
@@ -401,7 +401,7 @@ void NetworkSyncManager::Write2(NetPacket &Packet, uint16_t Data)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE-1) if (Packet.Position>=NETMAXBUFFERSIZE-1)
return; return;
Data = htons(Data); Data = Swap16BE(Data);
memcpy( &Packet.Data[Packet.Position], &Data,2 ); memcpy( &Packet.Data[Packet.Position], &Data,2 );
Packet.Position+=2; Packet.Position+=2;
} }
@@ -411,8 +411,8 @@ void NetworkSyncManager::Write4(NetPacket &Packet, uint32_t Data)
if (Packet.Position>=NETMAXBUFFERSIZE-3) if (Packet.Position>=NETMAXBUFFERSIZE-3)
return ; return ;
Data = htonl(Data); Data = Swap32BE(Data);
memcpy( (&Packet.Data[Packet.Position]), &Data,4 ); memcpy( &Packet.Data[Packet.Position], &Data,4 );
Packet.Position+=4; Packet.Position+=4;
} }