|
 |
1dc743 |
--- nss/cmd/httpserv/httpserv.c.539183 2016-05-21 18:31:39.879585420 -0700
|
|
|
1dc743 |
+++ nss/cmd/httpserv/httpserv.c 2016-05-21 18:37:22.374464057 -0700
|
|
|
1dc743 |
@@ -953,23 +953,23 @@
|
|
|
1dc743 |
getBoundListenSocket(unsigned short port)
|
|
|
1dc743 |
{
|
|
|
1dc743 |
PRFileDesc *listen_sock;
|
|
|
1dc743 |
int listenQueueDepth = 5 + (2 * maxThreads);
|
|
|
1dc743 |
PRStatus prStatus;
|
|
|
1dc743 |
PRNetAddr addr;
|
|
|
1dc743 |
PRSocketOptionData opt;
|
|
|
1dc743 |
|
|
|
1dc743 |
- addr.inet.family = PR_AF_INET;
|
|
|
1dc743 |
- addr.inet.ip = PR_INADDR_ANY;
|
|
|
1dc743 |
- addr.inet.port = PR_htons(port);
|
|
|
1dc743 |
+ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
|
|
|
1dc743 |
+ errExit("PR_SetNetAddr");
|
|
|
1dc743 |
+ }
|
|
|
1dc743 |
|
|
|
1dc743 |
- listen_sock = PR_NewTCPSocket();
|
|
|
1dc743 |
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
|
1dc743 |
if (listen_sock == NULL) {
|
|
|
1dc743 |
- errExit("PR_NewTCPSocket");
|
|
|
1dc743 |
+ errExit("PR_OpenTCPSockett");
|
|
|
1dc743 |
}
|
|
|
1dc743 |
|
|
|
1dc743 |
opt.option = PR_SockOpt_Nonblocking;
|
|
|
1dc743 |
opt.value.non_blocking = PR_FALSE;
|
|
|
1dc743 |
prStatus = PR_SetSocketOption(listen_sock, &opt;;
|
|
|
1dc743 |
if (prStatus < 0) {
|
|
|
1dc743 |
PR_Close(listen_sock);
|
|
|
1dc743 |
errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)");
|
|
|
1dc743 |
--- nss/cmd/selfserv/selfserv.c.539183 2016-05-21 18:31:39.882585367 -0700
|
|
|
1dc743 |
+++ nss/cmd/selfserv/selfserv.c 2016-05-21 18:41:43.092801174 -0700
|
|
|
1dc743 |
@@ -1711,23 +1711,23 @@
|
|
|
1dc743 |
getBoundListenSocket(unsigned short port)
|
|
|
1dc743 |
{
|
|
|
1dc743 |
PRFileDesc *listen_sock;
|
|
|
1dc743 |
int listenQueueDepth = 5 + (2 * maxThreads);
|
|
|
1dc743 |
PRStatus prStatus;
|
|
|
1dc743 |
PRNetAddr addr;
|
|
|
1dc743 |
PRSocketOptionData opt;
|
|
|
1dc743 |
|
|
|
1dc743 |
- addr.inet.family = PR_AF_INET;
|
|
|
1dc743 |
- addr.inet.ip = PR_INADDR_ANY;
|
|
|
1dc743 |
- addr.inet.port = PR_htons(port);
|
|
|
1dc743 |
+ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
|
|
|
1dc743 |
+ errExit("PR_SetNetAddr");
|
|
|
1dc743 |
+ }
|
|
|
1dc743 |
|
|
|
1dc743 |
- listen_sock = PR_NewTCPSocket();
|
|
|
1dc743 |
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
|
1dc743 |
if (listen_sock == NULL) {
|
|
|
1dc743 |
- errExit("PR_NewTCPSocket");
|
|
|
1dc743 |
+ errExit("PR_OpenTCPSocket error");
|
|
|
1dc743 |
}
|
|
|
1dc743 |
|
|
|
1dc743 |
opt.option = PR_SockOpt_Nonblocking;
|
|
|
1dc743 |
opt.value.non_blocking = PR_FALSE;
|
|
|
1dc743 |
prStatus = PR_SetSocketOption(listen_sock, &opt;;
|
|
|
1dc743 |
if (prStatus < 0) {
|
|
|
1dc743 |
PR_Close(listen_sock);
|
|
|
1dc743 |
errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)");
|