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

EzSockets: Don't leak WinAPI everywhere this gets included. Fixes #1455

Browse Source
This commit is contained in:
Colby Klein
2017-05-24 01:23:22 -07:00
parent 631523ace3
commit 41b602c90f
3 changed files with 176 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetworkSyncManager.cpp
+6 -6
View File
@@ -212,7 +212,7 @@ void NetworkSyncManager::StartUp()
PostStartUp( ServerIP );
BroadcastReception = new EzSockets;
BroadcastReception->create( IPPROTO_UDP );
BroadcastReception->create( EZS_UDP );
BroadcastReception->bind( 8765 );
BroadcastReception->blocking = false;
}
@@ -537,7 +537,7 @@ void NetworkSyncManager::Update(float fDeltaTime)
ThisServer.Name = BroadIn.ReadNT();
int port = BroadIn.Read2();
BroadIn.Read2(); //Num players connected.
uint32_t addy = EzSockets::LongFromAddrIn(BroadcastReception->fromAddr);
uint32_t addy = BroadcastReception->getAddress();
ThisServer.Address = ssprintf( "%u.%u.%u.%u:%d",
(addy<<0)>>24, (addy<<8)>>24, (addy<<16)>>24, (addy<<24)>>24, port );
@@ -867,7 +867,7 @@ uint16_t PacketFunctions::Read2()
uint16_t Temp;
memcpy( &Temp, Data + Position,2 );
Position+=2;
return ntohs(Temp);
return EzSockets::ntohs(Temp);
}
uint32_t PacketFunctions::Read4()
@@ -878,7 +878,7 @@ uint32_t PacketFunctions::Read4()
uint32_t Temp;
memcpy( &Temp, Data + Position,4 );
Position+=4;
return ntohl(Temp);
return EzSockets::ntohl(Temp);
}
RString PacketFunctions::ReadNT()
@@ -905,7 +905,7 @@ void PacketFunctions::Write2(uint16_t data)
{
if (Position>=NETMAXBUFFERSIZE-1)
return;
data = htons(data);
data = EzSockets::htons(data);
memcpy( &Data[Position], &data, 2 );
Position+=2;
}
@@ -915,7 +915,7 @@ void PacketFunctions::Write4(uint32_t data)
if (Position>=NETMAXBUFFERSIZE-3)
return ;
data = htonl(data);
data = EzSockets::htonl(data);
memcpy( &Data[Position], &data, 4 );
Position+=4;
}