AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Mayaqua/Network.c: improve RecvFrom() and RecvFrom6()

Browse Source 
This commit improves the RecvFrom() and RecvFrom6() functions by:
- Using the right data type for the struct size variable passed to recvfrom().
- Improving the arguments validation mechanism.
- Printing unhandled errors.
This commit is contained in:
Davide Beatrici 2018-10-08 03:21:10 +02:00
parent 66b906378f
commit 9fa9f6cdc1
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/Mayaqua/Network.c
View File

@ -10707,36 +10707,40 @@ void FreeRouteTable(ROUTE_TABLE *t)
// UDP receiving // UDP receiving
UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size) UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
{ {
SOCKET s;
int ret, sz;
struct sockaddr_in addr; struct sockaddr_in addr;
int ret = 0;
#ifdef OS_WIN32
int socklen = sizeof(addr);
#else
socklen_t socklen = sizeof(addr);
#endif
// Validate arguments // Validate arguments
if (sock != NULL) if (sock != NULL)
{ {
sock->IgnoreRecvErr = false;
}
if (sock == NULL || src_addr == NULL || src_port == NULL || data == NULL)
{
return false;
}
if (sock->Type != SOCK_UDP || sock->socket == INVALID_SOCKET)
{
return false;
}
if (size == 0)
{
return false;
}
if (sock->IPv6) if (sock->IPv6)
{ {
return RecvFrom6(sock, src_addr, src_port, data, size); return RecvFrom6(sock, src_addr, src_port, data, size);
} }
s = sock->socket; sock->IgnoreRecvErr = false;
}
else
{
return 0;
}
sz = sizeof(addr); if (src_addr == NULL || src_port == NULL || data == NULL || size == 0)
ret = recvfrom(s, data, size, 0, (struct sockaddr *)&addr, (int *)&sz); {
return 0;
}
if (sock->Type != SOCK_UDP || sock->socket == INVALID_SOCKET)
{
return 0;
}
ret = recvfrom(sock->socket, data, size, 0, (struct sockaddr *)&addr, &socklen);
if (ret > 0) if (ret > 0)
{ {
InAddrToIP(src_addr, &addr.sin_addr); InAddrToIP(src_addr, &addr.sin_addr);
@ -10744,13 +10748,6 @@ UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
if (sock->IsRawSocket) if (sock->IsRawSocket)
{ {
*src_port = sock->LocalPort; *src_port = sock->LocalPort;
/*
{
char tmp[MAX_SIZE];
IPToStr(tmp, sizeof(tmp), &sock->LocalIP);
Debug("Raw: %u from %s\n", sock->LocalPort, tmp);
}*/
} }
Lock(sock->lock); Lock(sock->lock);
@ -10760,14 +10757,10 @@ UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
} }
Unlock(sock->lock); Unlock(sock->lock);
// Debug("UDP RecvFrom: %u\n", ret);
return (UINT)ret; return (UINT)ret;
} }
else else
{ {
sock->IgnoreRecvErr = false;
#ifdef OS_WIN32 #ifdef OS_WIN32
if (WSAGetLastError() == WSAECONNRESET || WSAGetLastError() == WSAENETRESET || WSAGetLastError() == WSAEMSGSIZE || WSAGetLastError() == WSAENETUNREACH || if (WSAGetLastError() == WSAECONNRESET || WSAGetLastError() == WSAENETRESET || WSAGetLastError() == WSAEMSGSIZE || WSAGetLastError() == WSAENETUNREACH ||
WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEHOSTUNREACH || WSAGetLastError() == WSAEUSERS || WSAGetLastError() == WSAEADDRNOTAVAIL || WSAGetLastError() == WSAEADDRNOTAVAIL) WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEHOSTUNREACH || WSAGetLastError() == WSAEUSERS || WSAGetLastError() == WSAEADDRNOTAVAIL || WSAGetLastError() == WSAEADDRNOTAVAIL)
@ -10780,10 +10773,9 @@ UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
} }
else else
{ {
UINT e = WSAGetLastError(); Debug("RecvFrom(): recvfrom() failed with error: %u\n", WSAGetLastError());
// Debug("RecvFrom Error: %u\n", e);
} }
#else // OS_WIN32 #else
if (errno == ECONNREFUSED || errno == ECONNRESET || errno == EMSGSIZE || errno == ENOBUFS || errno == ENOMEM || errno == EINTR) if (errno == ECONNREFUSED || errno == ECONNRESET || errno == EMSGSIZE || errno == ENOBUFS || errno == ENOMEM || errno == EINTR)
{ {
sock->IgnoreRecvErr = true; sock->IgnoreRecvErr = true;
@ -10792,37 +10784,46 @@ UINT RecvFrom(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
{ {
return SOCK_LATER; return SOCK_LATER;
} }
#endif // OS_WIN32 else
{
Debug("RecvFrom(): recvfrom() failed with error: %s\n", strerror(errno));
}
#endif
return 0; return 0;
} }
} }
UINT RecvFrom6(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size) UINT RecvFrom6(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
{ {
SOCKET s;
int ret, sz;
struct sockaddr_in6 addr; struct sockaddr_in6 addr;
int ret = 0;
#ifdef OS_WIN32
int socklen = sizeof(addr);
#else
socklen_t socklen = sizeof(addr);
#endif
// Validate arguments // Validate arguments
if (sock != NULL) if (sock != NULL)
{ {
sock->IgnoreRecvErr = false; sock->IgnoreRecvErr = false;
} }
if (sock == NULL || src_addr == NULL || src_port == NULL || data == NULL) else
{ {
return false; return 0;
} }
if (src_addr == NULL || src_port == NULL || data == NULL || size == 0)
{
return 0;
}
if (sock->Type != SOCK_UDP || sock->socket == INVALID_SOCKET) if (sock->Type != SOCK_UDP || sock->socket == INVALID_SOCKET)
{ {
return false; return 0;
}
if (size == 0)
{
return false;
} }
s = sock->socket;
sz = sizeof(addr); ret = recvfrom(sock->socket, data, size, 0, (struct sockaddr *)&addr, &socklen);
ret = recvfrom(s, data, size, 0, (struct sockaddr *)&addr, (int *)&sz);
if (ret > 0) if (ret > 0)
{ {
InAddrToIP6(src_addr, &addr.sin6_addr); InAddrToIP6(src_addr, &addr.sin6_addr);
@ -10840,14 +10841,10 @@ UINT RecvFrom6(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
} }
Unlock(sock->lock); Unlock(sock->lock);
// Debug("UDP RecvFrom: %u\n", ret);
return (UINT)ret; return (UINT)ret;
} }
else else
{ {
sock->IgnoreRecvErr = false;
#ifdef OS_WIN32 #ifdef OS_WIN32
if (WSAGetLastError() == WSAECONNRESET || WSAGetLastError() == WSAENETRESET || WSAGetLastError() == WSAEMSGSIZE || WSAGetLastError() == WSAENETUNREACH || if (WSAGetLastError() == WSAECONNRESET || WSAGetLastError() == WSAENETRESET || WSAGetLastError() == WSAEMSGSIZE || WSAGetLastError() == WSAENETUNREACH ||
WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEHOSTUNREACH || WSAGetLastError() == WSAEUSERS || WSAGetLastError() == WSAEADDRNOTAVAIL || WSAGetLastError() == WSAEADDRNOTAVAIL) WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEHOSTUNREACH || WSAGetLastError() == WSAEUSERS || WSAGetLastError() == WSAEADDRNOTAVAIL || WSAGetLastError() == WSAEADDRNOTAVAIL)
@ -10860,10 +10857,9 @@ UINT RecvFrom6(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
} }
else else
{ {
UINT e = WSAGetLastError(); Debug("RecvFrom(): recvfrom() failed with error: %u\n", WSAGetLastError());
// Debug("RecvFrom Error: %u\n", e);
} }
#else // OS_WIN32 #else
if (errno == ECONNREFUSED || errno == ECONNRESET || errno == EMSGSIZE || errno == ENOBUFS || errno == ENOMEM || errno == EINTR) if (errno == ECONNREFUSED || errno == ECONNRESET || errno == EMSGSIZE || errno == ENOBUFS || errno == ENOMEM || errno == EINTR)
{ {
sock->IgnoreRecvErr = true; sock->IgnoreRecvErr = true;
@ -10872,7 +10868,11 @@ UINT RecvFrom6(SOCK *sock, IP *src_addr, UINT *src_port, void *data, UINT size)
{ {
return SOCK_LATER; return SOCK_LATER;
} }
#endif // OS_WIN32 else
{
Debug("RecvFrom(): recvfrom() failed with error: %s\n", strerror(errno));
}
#endif
return 0; return 0;
} }
} }