Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IPv6 support in PSM: bug 47834 r=ddrinan sr=brendan@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@84030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jgmyers%netscape.com 2000-12-23 01:26:25 +00:00
parent 70ef59ae38
commit 5167b4ed59
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/security/psm/server/sslconn.c
View File

@ -786,7 +786,7 @@ SSMStatus SSM_GetSSLSocket(SSMSSLDataConnection* conn)
/* set up SSL secure socket */
SSM_DEBUG("setting up secure socket.\n");
socket = PR_NewTCPSocket();
socket = PR_OpenTCPSocket(PR_AF_INET6);
if (socket == NULL) {
goto loser;
}
@ -821,7 +821,8 @@ SSMStatus SSM_GetSSLSocket(SSMSSLDataConnection* conn)
if (PR_StringToNetAddr(conn->hostIP, &addr) != PR_SUCCESS) {
PRIntn hostIndex;
prstatus = PR_GetHostByName(conn->hostName, buffer, 256, &hostentry);
prstatus = PR_GetIPNodeByName(conn->hostName, PR_AF_INET6, PR_AI_DEFAULT,
buffer, sizeof(buffer), &hostentry);
if (prstatus != PR_SUCCESS) {
goto loser;
}
@ -840,7 +841,14 @@ SSMStatus SSM_GetSSLSocket(SSMSSLDataConnection* conn)
SSM_DEBUG("Connected to target.\n");
} else {
if (PR_InitializeNetAddr(PR_IpAddrNull, (PRUint16)conn->port, &addr) != PR_SUCCESS) {
if (PR_NetAddrFamily(&addr) == PR_AF_INET) {
PRIPv6Addr v6addr;
PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &v6addr);
if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, (PRUint16)conn->port, &addr) != PR_SUCCESS) {
goto loser;
}
addr.ipv6.ip = v6addr;
} else if (PR_SetNetAddr(PR_IpAddrNull, PR_AF_INET6, (PRUint16)conn->port, &addr) != PR_SUCCESS) {
goto loser;
}
if (PR_Connect(conn->socketSSL, &addr, PR_INTERVAL_NO_TIMEOUT) != PR_SUCCESS) {