Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 18:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conversion of the SSL connection methods.

Browse source 
* Added new XPGP functions to checking certificates.
* Converted SSL classes from cert * -> p3AuthMgr.
* Added check of addresses before connect attempt.
* started up listener correctly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-28 05:40:32 +00:00
parent f9d6f1c418
commit 798e19d58c
14 changed files with 221 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libretroshare/src/pqi/p3connmgr.cc
View file

@ -1079,7 +1079,7 @@ void p3ConnectMgr::peerStatus(std::string id,
pca.type = RS_NET_CONN_TCP_LOCAL;
pca.addr = details.laddr;
it->second.connAddrs.push_front(pca);
it->second.connAddrs.push_back(pca);
}
if ((details.type & RS_NET_CONN_TCP_EXTERNAL) &&
@ -1092,7 +1092,7 @@ void p3ConnectMgr::peerStatus(std::string id,
pca.type = RS_NET_CONN_TCP_EXTERNAL;
pca.addr = details.raddr;
it->second.connAddrs.push_front(pca);
it->second.connAddrs.push_back(pca);
}
if (it->second.inConnAttempt)
@ -1491,7 +1491,7 @@ bool p3ConnectMgr::retryConnect(std::string id)
pca.type = RS_NET_CONN_TCP_LOCAL;
pca.addr = it->second.localaddr;
it->second.connAddrs.push_front(pca);
it->second.connAddrs.push_back(pca);
}
else
{
@ -1539,7 +1539,7 @@ bool p3ConnectMgr::retryConnect(std::string id)
pca.type = RS_NET_CONN_TCP_EXTERNAL;
pca.addr = it->second.serveraddr;
it->second.connAddrs.push_front(pca);
it->second.connAddrs.push_back(pca);
}
else
{
@ -1554,9 +1554,13 @@ bool p3ConnectMgr::retryConnect(std::string id)
return true;
}
/* start a connection attempt */
it->second.actions |= RS_PEER_CONNECT_REQ;
mStatusChanged = true;
/* start a connection attempt (only if we stuck something on the queue) */
if (it->second.connAddrs.size() > 0)
{
it->second.actions |= RS_PEER_CONNECT_REQ;
mStatusChanged = true;
}
return true;
}