Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-10 11:58:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

NETWORK REWORK (cont)

Browse Source 
* restored AuthSSL::Failed/CheckCertificate() calls.
 * removed mConnMgr->isConnected() checks. These should be elsewhere.
 * enabled exit(1) call if cannot open listening socket.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-06-25 22:06:49 +00:00
parent 981724a8f1
commit 5df785ed4e
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libretroshare/src/pqi/pqissllistener.cc
View File

@ -213,7 +213,8 @@ int pqissllistenbase::setuplisten()
pqioutput(PQL_ALERT, pqissllistenzone, out.str()); pqioutput(PQL_ALERT, pqissllistenzone, out.str());
std::cerr << out.str() << std::endl; std::cerr << out.str() << std::endl;
exit(1) ; exit(1);
return -1;
} }
else else
{ {
@ -231,6 +232,7 @@ int pqissllistenbase::setuplisten()
pqioutput(PQL_ALERT, pqissllistenzone, out.str()); pqioutput(PQL_ALERT, pqissllistenzone, out.str());
std::cerr << out.str() << std::endl; std::cerr << out.str() << std::endl;
exit(1);
return -1; return -1;
} }
else else
@ -391,7 +393,7 @@ int pqissllistenbase::continueSSL(SSL *ssl, struct sockaddr_in remote_addr, bool
} }
/* we have failed -> get certificate if possible */ /* we have failed -> get certificate if possible */
//Extract_Failed_SSL_Certificate(ssl, &remote_addr); Extract_Failed_SSL_Certificate(ssl, &remote_addr);
// other wise delete ssl connection. // other wise delete ssl connection.
// kill connection.... // kill connection....
@ -470,11 +472,11 @@ int pqissllistenbase::Extract_Failed_SSL_Certificate(SSL *ssl, struct sockaddr_
} }
pqioutput(PQL_DEBUG_BASIC, pqissllistenzone, pqioutput(PQL_DEBUG_BASIC, pqissllistenzone,
"pqissllistenbase::Extract_Failed_SSL_Certificate() Have Peer Cert - (Not) Registering (Anymore)"); "pqissllistenbase::Extract_Failed_SSL_Certificate() Have Peer Cert - Registering");
// save certificate... (and ip locations) // save certificate... (and ip locations)
// false for outgoing.... // false for outgoing....
//AuthSSL::getAuthSSL()->FailedCertificate(peercert, true); AuthSSL::getAuthSSL()->FailedCertificate(peercert, true);
return 1; return 1;
} }
@ -656,16 +658,10 @@ int pqissllistener::completeConnection(int fd, SSL *ssl, struct sockaddr_in &rem
out << "\tagainst: " << it->first << std::endl; out << "\tagainst: " << it->first << std::endl;
if (it -> first == newPeerId) if (it -> first == newPeerId)
{ {
// accept even if already connected.
out << "\t\tMatch!"; out << "\t\tMatch!";
//check if peer is not already connected
peerConnectState pcs;
if (mConnMgr->getFriendNetStatus(newPeerId, pcs) && (pcs.state & RS_PEER_CONNECTED && !(pcs.connecttype & RS_NET_CONN_TUNNEL))) {
out << "\t\tPeer is already connected !";
break;
} else {
found = true; found = true;
} }
}
else else
{ {
it++; it++;
@ -675,13 +671,23 @@ int pqissllistener::completeConnection(int fd, SSL *ssl, struct sockaddr_in &rem
pqioutput(PQL_DEBUG_BASIC, pqissllistenzone, out.str()); pqioutput(PQL_DEBUG_BASIC, pqissllistenzone, out.str());
} }
if (found == false) { if (found == false)
{
std::ostringstream out; std::ostringstream out;
out << "Don't accept connection because friend is not found or (probably) already connected"; out << "No Matching Certificate";
out << " for Connection:" << inet_ntoa(remote_addr.sin_addr); out << " for Connection:" << inet_ntoa(remote_addr.sin_addr);
out << std::endl; out << std::endl;
out << "pqissllistenbase: Will shut it down!" << std::endl; out << "pqissllistenbase: Will shut it down!" << std::endl;
pqioutput(PQL_WARNING, pqissllistenzone, out.str()); pqioutput(PQL_WARNING, pqissllistenzone, out.str());
// but as it passed the authentication step,
// we can add it into the AuthSSL, and mConnMgr.
AuthSSL::getAuthSSL()->CheckCertificate(newPeerId, peercert);
/* now need to get GPG id too */
//mConnMgr->addPeer(newPeerId);
X509_free(peercert); X509_free(peercert);
return -1; return -1;
} }