From 31ebe5983e84bba1f9c894111e7169bf8cddd865 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 27 Jan 2017 16:31:41 +0100 Subject: [PATCH 1/4] Network: Fix typo.. --- src/Nazara/Network/Posix/SocketImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index baaa8a0d0..19da49c89 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include From 7602b4a041ac3ab01557c2ef337fb730293ba399 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 27 Jan 2017 16:37:16 +0100 Subject: [PATCH 2/4] Network/SocketImpl: Fix typo --- src/Nazara/Network/Posix/SocketImpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index 19da49c89..3b7f9bccb 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -611,12 +611,12 @@ namespace Nz sysBuffers[i].iov_len = buffers[i].dataLength; } - struct msghdr header; - std::memset(&header, 0, sizeof(header); + struct msghdr msgHdr; + std::memset(&msgHdr, 0, sizeof(header)); IpAddressImpl::SockAddrBuffer nameBuffer; - header.msg_namelen = IpAddressImpl::ToSockAddr(to, nameBuffer.data()); - header.msg_name = nameBuffer.data(); + msgHdr.msg_namelen = IpAddressImpl::ToSockAddr(to, nameBuffer.data()); + msgHdr.msg_name = nameBuffer.data(); msgHdr.msg_iov = sysBuffers; msgHdr.msg_iovlen = static_cast(bufferCount); From 80442924c1c38b3eb14777ae5d44d2442c6debfb Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 27 Jan 2017 16:43:54 +0100 Subject: [PATCH 3/4] Network/SocketImpl: Fix code, once more --- src/Nazara/Network/Posix/SocketImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index 3b7f9bccb..a75a0df35 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -612,7 +612,7 @@ namespace Nz } struct msghdr msgHdr; - std::memset(&msgHdr, 0, sizeof(header)); + std::memset(&msgHdr, 0, sizeof(msgHdr)); IpAddressImpl::SockAddrBuffer nameBuffer; msgHdr.msg_namelen = IpAddressImpl::ToSockAddr(to, nameBuffer.data()); @@ -620,7 +620,7 @@ namespace Nz msgHdr.msg_iov = sysBuffers; msgHdr.msg_iovlen = static_cast(bufferCount); - int sentLength = sendmsg(socket, &msgHdr, MSG_NOSIGNAL); + int byteSent = sendmsg(socket, &msgHdr, MSG_NOSIGNAL); if (byteSent == SOCKET_ERROR) { int errorCode = GetLastErrorCode(); From 42d5f849f7331ce4b3f8034098d74de41c3a9932 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 27 Jan 2017 16:49:09 +0100 Subject: [PATCH 4/4] Network/SocketImpl: Okay, I promise to try to compile myself next time --- src/Nazara/Network/Posix/SocketImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index a75a0df35..be6f84581 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -620,7 +620,7 @@ namespace Nz msgHdr.msg_iov = sysBuffers; msgHdr.msg_iovlen = static_cast(bufferCount); - int byteSent = sendmsg(socket, &msgHdr, MSG_NOSIGNAL); + int byteSent = sendmsg(handle, &msgHdr, MSG_NOSIGNAL); if (byteSent == SOCKET_ERROR) { int errorCode = GetLastErrorCode();