ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-02-07 08:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add error handling for Opensolaris f***ing up a numeric getnameinfo() call.

Browse source 
- Fix memory leak in getaddrinfo() call
Many thanks to Ben Millwood for reporting this.
This commit is contained in:
Thilo Schulz 2009-06-26 18:11:45 +00:00
parent 948f7a6015
commit 9b2b9abd25
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
code/qcommon/net_ip.c
View file

@ -341,7 +341,8 @@ static void Sys_SockaddrToString(char *dest, int destlen, struct sockaddr *input
else else
inputlen = sizeof(struct sockaddr_in); inputlen = sizeof(struct sockaddr_in);
getnameinfo(input, inputlen, dest, destlen, NULL, 0, NI_NUMERICHOST); if(getnameinfo(input, inputlen, dest, destlen, NULL, 0, NI_NUMERICHOST) && destlen > 0)
*dest = '\0';
} }
/* /*
@ -1319,9 +1320,6 @@ void NET_GetLocalAddress( void ) {
char hostname[256]; char hostname[256];
struct addrinfo hint; struct addrinfo hint;
struct addrinfo *res = NULL; struct addrinfo *res = NULL;
struct addrinfo *search;
struct sockaddr_in mask4;
struct sockaddr_in6 mask6;
if(gethostname( hostname, 256 ) == SOCKET_ERROR) if(gethostname( hostname, 256 ) == SOCKET_ERROR)
return; return;
@ -1333,29 +1331,36 @@ void NET_GetLocalAddress( void ) {
hint.ai_family = AF_UNSPEC; hint.ai_family = AF_UNSPEC;
hint.ai_socktype = SOCK_DGRAM; hint.ai_socktype = SOCK_DGRAM;
if(getaddrinfo(hostname, NULL, &hint, &res)) if(!getaddrinfo(hostname, NULL, &hint, &res))
return;
/* On operating systems where it's more difficult to find out the configured interfaces, we'll just assume a
* netmask with all bits set. */
memset(&mask4, 0, sizeof(mask4));
memset(&mask6, 0, sizeof(mask6));
mask4.sin_family = AF_INET;
memset(&mask4.sin_addr.s_addr, 0xFF, sizeof(mask4.sin_addr.s_addr));
mask6.sin6_family = AF_INET6;
memset(&mask6.sin6_addr, 0xFF, sizeof(mask6.sin6_addr));
// add all IPs from returned list.
for(search = res; search; search = search->ai_next)
{ {
if(search->ai_family == AF_INET) struct sockaddr_in mask4;
NET_AddLocalAddress("", search->ai_addr, (struct sockaddr *) &mask4); struct sockaddr_in6 mask6;
else if(search->ai_family == AF_INET6) struct addrinfo *search;
NET_AddLocalAddress("", search->ai_addr, (struct sockaddr *) &mask6);
/* On operating systems where it's more difficult to find out the configured interfaces, we'll just assume a
* netmask with all bits set. */
memset(&mask4, 0, sizeof(mask4));
memset(&mask6, 0, sizeof(mask6));
mask4.sin_family = AF_INET;
memset(&mask4.sin_addr.s_addr, 0xFF, sizeof(mask4.sin_addr.s_addr));
mask6.sin6_family = AF_INET6;
memset(&mask6.sin6_addr, 0xFF, sizeof(mask6.sin6_addr));
// add all IPs from returned list.
for(search = res; search; search = search->ai_next)
{
if(search->ai_family == AF_INET)
NET_AddLocalAddress("", search->ai_addr, (struct sockaddr *) &mask4);
else if(search->ai_family == AF_INET6)
NET_AddLocalAddress("", search->ai_addr, (struct sockaddr *) &mask6);
}
Sys_ShowIP();
} }
Sys_ShowIP(); if(res)
freeaddrinfo(res);
} }
#endif #endif