summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarin%meer.net <devnull@localhost>2003-09-23 17:46:21 +0000
committerdarin%meer.net <devnull@localhost>2003-09-23 17:46:21 +0000
commita731df5db0b2c84ed7570c6edf6e6906ea4232e1 (patch)
tree04358262769a881a97e147ad696106a85e76df1f
parent5e8f754111c9a9a0f7f3ec5319693aa2a83fed64 (diff)
downloadnspr-hg-a731df5db0b2c84ed7570c6edf6e6906ea4232e1.tar.gz
fixes bug 220020 "PR_EnumerateAddrInfo should not special case port 0" r=wtc
-rw-r--r--pr/src/misc/prnetdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
index 0b8f99f7..eca157fa 100644
--- a/pr/src/misc/prnetdb.c
+++ b/pr/src/misc/prnetdb.c
@@ -2139,8 +2139,10 @@ PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void *iterPtr,
if (ai->ai_addrlen < sizeof(PRNetAddr))
memset(((char*)result)+ai->ai_addrlen, 0, sizeof(PRNetAddr) - ai->ai_addrlen);
- if (port != 0)
- result->inet.port = PR_htons(port);
+ if (result->raw.family == PR_AF_INET)
+ result->inet.port = htons(port);
+ else
+ result->ipv6.port = htons(port);
}
return ai;