TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/platform/platformNet.cpp
View file

@ -280,7 +280,7 @@ namespace PlatformNetState
if (addressString[0] == '[')
{
// Must be ipv6 notation
dStrcpy(outAddress, addressString+1);
dStrcpy(outAddress, addressString+1, 256);
addressString = outAddress;
portString = dStrchr(outAddress, ']');
@ -305,7 +305,7 @@ namespace PlatformNetState
}
else
{
dStrcpy(outAddress, addressString);
dStrcpy(outAddress, addressString, 256);
addressString = outAddress;
// Check to see if we have multiple ":" which would indicate this is an ipv6 address
@ -546,7 +546,7 @@ static PolledSocket* addPolledSocket(NetSocket handleFd, SOCKET fd, S32 state,
sock->handleFd = handleFd;
sock->state = state;
if (remoteAddr)
dStrcpy(sock->remoteAddr, remoteAddr);
dStrcpy(sock->remoteAddr, remoteAddr, 256);
if (port != -1)
sock->remotePort = port;
gPolledSockets.push_back(sock);