mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 06:50:40 -04:00
Conversion of the SSL connection methods.
* 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:
parent
f9d6f1c418
commit
798e19d58c
14 changed files with 221 additions and 109 deletions
|
@ -280,6 +280,7 @@ int pqipersongrp::addPeer(std::string id)
|
|||
|
||||
// reset it to start it working.
|
||||
pqip -> reset();
|
||||
pqip -> listen();
|
||||
|
||||
return AddSearchModule(sm);
|
||||
}
|
||||
|
@ -330,15 +331,30 @@ int pqipersongrp::connectPeer(std::string id)
|
|||
struct sockaddr_in addr;
|
||||
uint32_t type;
|
||||
|
||||
mConnMgr->connectAttempt(id, addr, type);
|
||||
if (!mConnMgr->connectAttempt(id, addr, type))
|
||||
{
|
||||
std::cerr << " pqipersongrp::connectPeer() No Net Address";
|
||||
std::cerr << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::cerr << " pqipersongrp::connectPeer() connectAttempt data id: " << id;
|
||||
std::cerr << " addr: " << inet_ntoa(addr.sin_addr) << ":" << ntohs(addr.sin_port);
|
||||
std::cerr << " type: " << type;
|
||||
std::cerr << std::endl;
|
||||
|
||||
|
||||
uint32_t ptype;
|
||||
if (type & RS_NET_CONN_TCP_ALL)
|
||||
{
|
||||
std::cerr << " pqipersongrp::connectPeer() connecting with TCP";
|
||||
std::cerr << std::endl;
|
||||
ptype = PQI_CONNECT_TCP;
|
||||
}
|
||||
else if (type & RS_NET_CONN_UDP_ALL)
|
||||
{
|
||||
std::cerr << " pqipersongrp::connectPeer() connecting with UDP";
|
||||
std::cerr << std::endl;
|
||||
ptype = PQI_CONNECT_UDP;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue