JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* net.cc (cygwin_getnameinfo): Force setting NI_NUMERICSERV only

Browse Source 
on Windows 2003 and earlier, only if the port number doesn't
	resolve to a well-known service.  Change comment accordingly.
This commit is contained in:
Corinna Vinschen 2009-08-06 14:55:49 +00:00
parent a99345591f
commit 19753e1dbf
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2009-08-06 Corinna Vinschen <corinna@vinschen.de>
* net.cc (cygwin_getnameinfo): Force setting NI_NUMERICSERV only
on Windows 2003 and earlier, only if the port number doesn't
resolve to a well-known service. Change comment accordingly.
2009-08-05 Christopher Faylor <me+cygwin@cgf.cx> 2009-08-05 Christopher Faylor <me+cygwin@cgf.cx>
* cygheap.h (cygheap_debug::endh): Delete. * cygheap.h (cygheap_debug::endh): Delete.

31
winsup/cygwin/net.cc
View File

@ -4458,20 +4458,27 @@ cygwin_getnameinfo (const struct sockaddr *sa, socklen_t salen,
if (!getnameinfo) if (!getnameinfo)
return ipv4_getnameinfo (sa, salen, host, hostlen, serv, servlen, flags); return ipv4_getnameinfo (sa, salen, host, hostlen, serv, servlen, flags);
/* When the incoming port number is set to 0, Winsock's getnameinfo /* When the incoming port number does not resolve to a well-known service,
returns with error WSANO_DATA instead of simply ignoring the port. Winsock's getnameinfo up to Windows 2003 returns with error WSANO_DATA
To avoid this strange behaviour, we check manually, if the port number instead of setting `serv' to the numeric port number string, as required
is 0. If so, set the NI_NUMERICSERV flag to avoid this problem. */ by RFC 3493. This is fixed on Vista and later. To avoid the error on
switch (sa->sa_family) systems up to Windows 2003, we check if the port number resolves
to a well-known service. If not, we set the NI_NUMERICSERV flag. */
if (!wincap.supports_all_posix_ai_flags ())
{ {
case AF_INET: int port = 0;
if (((struct sockaddr_in *) sa)->sin_port == 0)
switch (sa->sa_family)
{
case AF_INET:
port = ((struct sockaddr_in *) sa)->sin_port;
break;
case AF_INET6:
port = ((struct sockaddr_in6 *) sa)->sin6_port;
break;
}
if (!port || !getservbyport (port, flags & NI_DGRAM ? "udp" : "tcp"))
flags |= NI_NUMERICSERV; flags |= NI_NUMERICSERV;
break;
case AF_INET6:
if (((struct sockaddr_in6 *) sa)->sin6_port == 0)
flags |= NI_NUMERICSERV;
break;
} }
int ret = w32_to_gai_err (getnameinfo (sa, salen, host, hostlen, serv, int ret = w32_to_gai_err (getnameinfo (sa, salen, host, hostlen, serv,
servlen, flags)); servlen, flags));