Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

stop ssl listening when already connected

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-20 13:27:26 +00:00
parent 1bb1f4575b
commit bc27e188f9
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/pqi/pqissl.cc
View File

@ -245,6 +245,7 @@ int pqissl::reset()
n_read_zero = 0; n_read_zero = 0;
total_len = 0 ; total_len = 0 ;
mTimeoutTS = 0; mTimeoutTS = 0;
listen();
if (neededReset) if (neededReset)
{ {
@ -1120,20 +1121,15 @@ int pqissl::Authorise_SSL_Connection()
return err; return err;
} }
stoplistening();
rslog(RSL_DEBUG_BASIC, pqisslzone, rslog(RSL_DEBUG_BASIC, pqisslzone,
"pqissl::Authorise_SSL_Connection() SSL_Connection_Complete"); "pqissl::Authorise_SSL_Connection() SSL_Connection_Complete");
// reset switch. // reset switch.
waiting = WAITING_NOT; waiting = WAITING_NOT;
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
XPGP *peercert = SSL_get_peer_pgp_certificate(ssl_connection);
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
X509 *peercert = SSL_get_peer_certificate(ssl_connection); X509 *peercert = SSL_get_peer_certificate(ssl_connection);
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
if (peercert == NULL) if (peercert == NULL)
{ {
@ -1155,14 +1151,7 @@ int pqissl::Authorise_SSL_Connection()
// (pqissl's case) sslcert->serveraddr or sslcert->localaddr. // (pqissl's case) sslcert->serveraddr or sslcert->localaddr.
bool certCorrect = false; bool certCorrect = false;
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
certCorrect = mAuthMgr->CheckCertificateXPGP(PeerId(), peercert);
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
certCorrect = mAuthMgr->CheckCertificate(PeerId(), peercert); certCorrect = mAuthMgr->CheckCertificate(PeerId(), peercert);
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
// check it's the right one. // check it's the right one.
if (certCorrect) if (certCorrect)