sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-01-27 16:49:25 +01:00
parent 0075c22e0c 42d5f849f7
commit 9a1ac8a2c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Nazara/Network/Posix/SocketImpl.cpp
View File

@ -5,7 +5,7 @@
#include <Nazara/Network/Posix/SocketImpl.hpp> #include <Nazara/Network/Posix/SocketImpl.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
#include <Nazara/Core/MemoryManager.hpp> #include <Nazara/Core/MemoryHelper.hpp>
#include <Nazara/Network/Posix/IpAddressImpl.hpp> #include <Nazara/Network/Posix/IpAddressImpl.hpp>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -611,16 +611,16 @@ namespace Nz
sysBuffers[i].iov_len = buffers[i].dataLength; sysBuffers[i].iov_len = buffers[i].dataLength;
} }
struct msghdr header; struct msghdr msgHdr;
std::memset(&header, 0, sizeof(header); std::memset(&msgHdr, 0, sizeof(msgHdr));
IpAddressImpl::SockAddrBuffer nameBuffer; IpAddressImpl::SockAddrBuffer nameBuffer;
header.msg_namelen = IpAddressImpl::ToSockAddr(to, nameBuffer.data()); msgHdr.msg_namelen = IpAddressImpl::ToSockAddr(to, nameBuffer.data());
header.msg_name = nameBuffer.data(); msgHdr.msg_name = nameBuffer.data();
msgHdr.msg_iov = sysBuffers; msgHdr.msg_iov = sysBuffers;
msgHdr.msg_iovlen = static_cast<int>(bufferCount); msgHdr.msg_iovlen = static_cast<int>(bufferCount);
int sentLength = sendmsg(socket, &msgHdr, MSG_NOSIGNAL); int byteSent = sendmsg(handle, &msgHdr, MSG_NOSIGNAL);
if (byteSent == SOCKET_ERROR) if (byteSent == SOCKET_ERROR)
{ {
int errorCode = GetLastErrorCode(); int errorCode = GetLastErrorCode();