Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove extra cruft

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2017-09-15 08:56:54 +02:00
parent 016cafdd23
commit 7888ec617a
1 changed files with 59 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
libresapi/src/api/PeersHandler.cpp
View File

@ -32,11 +32,6 @@
#include "Operators.h" #include "Operators.h"
#include "ApiTypes.h" #include "ApiTypes.h"
//#include "util/rsdebug.h"
//static struct RsLog::logInfo peersHandlerInfo = {RsLog::Default, "peersHandler"};
//#define peerhandlerzone &peersHandlerInfo
namespace resource_api namespace resource_api
{ {
@ -636,15 +631,14 @@ void PeersHandler::handleWildcard(Request &req, Response &resp)
{ {
flags = RS_NODE_PERM_DEFAULT; flags = RS_NODE_PERM_DEFAULT;
} }
//RsPeerId peer_id;
//RsPgpId pgp_id;
//std::string cleanCert;
uint32_t error_code; uint32_t error_code;
std::string error_string; std::string error_string;
RsPeerDetails peerDetails; RsPeerDetails peerDetails;
//std::string debug_string = " ";
RsPgpId own_pgp = mRsPeers->getGPGOwnId(); RsPgpId own_pgp = mRsPeers->getGPGOwnId();
RsPeerId ownpeer_id = mRsPeers->getOwnId(); RsPeerId ownpeer_id = mRsPeers->getOwnId();
do do
{ {
@ -654,124 +648,90 @@ void PeersHandler::handleWildcard(Request &req, Response &resp)
RsPeerId ssl_id; RsPeerId ssl_id;
std::string error_string; std::string error_string;
if(!mRsPeers->loadCertificateFromString(cert_string,ssl_id,pgp_id,error_string)) if(!mRsPeers->loadCertificateFromString( cert_string,
ssl_id, pgp_id,
error_string ))
{ {
std::cerr << "handleWildcard::loadCertificateFromString(): cannot load that certificate. " ; resp.mDebug << "cannot load that certificate "
std::cerr << error_string << std::endl; << std::endl << error_string << std::endl;
resp.mDebug << "cannot load that certificate " << std::endl;
resp.mDebug << error_string << std::endl;
break; break;
} }
} }
std::cerr << "handleWildcard addPeer: loadDetailsFromStringCert" << std::endl; if(!mRsPeers->loadDetailsFromStringCert( cert_string,
peerDetails,
if(!mRsPeers->loadDetailsFromStringCert(cert_string, peerDetails, error_code)) error_code ))
{ {
resp.mDebug << "Error: failed to add peer can not get peerDetails" << std::endl; resp.mDebug << "Error: failed to add peer can not get "
resp.mDebug << error_code << std::endl; << "peerDetails" << std::endl << error_code
<< std::endl;
break; break;
} }
std::cerr << "handleWildcard addPeer: peerDetails.gpg_id" << std::endl;
if(peerDetails.gpg_id.isNull()) if(peerDetails.gpg_id.isNull())
{ {
resp.mDebug << "Error: failed to add peer gpg_id.isNull" << std::endl; resp.mDebug << "Error: failed to add peer gpg_id.isNull"
resp.mDebug << error_string << std::endl; << std::endl << error_string << std::endl;
break; break;
} }
if(peerDetails.gpg_id == own_pgp)
{
if(peerDetails.id == ownpeer_id) if(peerDetails.id == ownpeer_id)
{ {
std::cerr << "handleWildcard addPeer: is own peer_id, ignore" << std::endl; std::cerr << __PRETTY_FUNCTION__ << " addPeer: is own "
resp.mDebug << "Error: failed to add peer_id, because its your own peer_id" << std::endl; << "peer_id, ignore" << std::endl;
resp.mDebug << error_string << std::endl; resp.mDebug << "Error: failed to add peer_id, because "
<< "its your own peer_id" << std::endl
<< error_string << std::endl;
break; break;
} }
std::cerr << "handleWildcard addPeer: is own pgp_id, update only" << std::endl; if(!mRsPeers->addFriend( peerDetails.id, peerDetails.gpg_id,
flags ))
}
else
{ {
std::cerr << __PRETTY_FUNCTION__
if(!mRsPeers->addFriend(peerDetails.id, peerDetails.gpg_id, flags)) << "Error: failed to addFriend" << std::endl;
{ resp.mDebug << "Error: failed to addFriend" << std::endl
resp.mDebug << "Error: failed to addFriend" << std::endl; << error_string << std::endl;
resp.mDebug << error_string << std::endl;
break; break;
} }
std::cerr << "handleWildcard addPeer: addFriend ok " << peerDetails.gpg_id << std::endl;
}
ok = true; ok = true;
// Retrun node details to response, after succes of adding peers // Retrun node details to response, after succes of adding peers
peerDetailsToStream(resp.mDataStream, peerDetails); peerDetailsToStream(resp.mDataStream, peerDetails);
std::cerr << "handleWildcard addPeer: peerDetailsToStream" << std::endl;
if (!peerDetails.location.empty()) if (!peerDetails.location.empty())
{ {
std::cerr << "handleWildcard addPeer: setting peer node." << std::endl;
mRsPeers->setLocation(peerDetails.id, peerDetails.location); mRsPeers->setLocation(peerDetails.id, peerDetails.location);
} }
// Update new address even the peer already existed. // Update new address even the peer already existed.
if (peerDetails.isHiddenNode) if (peerDetails.isHiddenNode)
{ {
std::cerr << "handleWildcard addPeer: setting hidden node."; mRsPeers->setHiddenNode( peerDetails.id,
std::cerr << peerDetails.hiddenNodeAddress; peerDetails.hiddenNodeAddress,
std::cerr << " Port: " << peerDetails.hiddenNodePort << std::endl; peerDetails.hiddenNodePort );
mRsPeers->setHiddenNode(peerDetails.id, peerDetails.hiddenNodeAddress, peerDetails.hiddenNodePort);
} }
else else
{ {
//let's check if there is ip adresses in the certificate. //let's check if there is ip adresses in the certificate.
if (!peerDetails.extAddr.empty() && peerDetails.extPort) if (!peerDetails.extAddr.empty() && peerDetails.extPort)
{ mRsPeers->setExtAddress( peerDetails.id,
std::cerr << "handleWildcard addPeer: setting ip ext address." ; peerDetails.extAddr,
std::cerr << peerDetails.extAddr; peerDetails.extPort );
std::cerr << " Port: " << peerDetails.extPort;
std::cerr << std::endl;
mRsPeers->setExtAddress(peerDetails.id, peerDetails.extAddr, peerDetails.extPort);
}
if (!peerDetails.localAddr.empty() && peerDetails.localPort) if (!peerDetails.localAddr.empty() && peerDetails.localPort)
{ mRsPeers->setLocalAddress( peerDetails.id,
std::cerr << "handleWildcard addPeer: setting ip local address." ; peerDetails.localAddr,
std::cerr << peerDetails.localAddr; peerDetails.localPort );
std::cerr << " Port: " << peerDetails.localPort << std::endl;
mRsPeers->setLocalAddress(peerDetails.id, peerDetails.localAddr, peerDetails.localPort);
}
if (!peerDetails.dyndns.empty()) if (!peerDetails.dyndns.empty())
{
std::cerr << "handleWildcard addPeer: setting DynDNS." ;
std::cerr << peerDetails.dyndns << std::endl;
mRsPeers->setDynDNS(peerDetails.id, peerDetails.dyndns); mRsPeers->setDynDNS(peerDetails.id, peerDetails.dyndns);
} }
} }
while(false);
// std::cerr << debug_string << std::endl;
// resp.mDebug << debug_string << std::endl;
// rslog(RSL_WARNING, peerhandlerzone, debug_string );
}while(0);
} }
} }
if(ok) if(ok) resp.setOk();
{ else resp.setFail();
resp.setOk();
}
else
{
resp.setFail();
}
} }
void PeersHandler::handleAttemptConnection(Request &req, Response &resp) void PeersHandler::handleAttemptConnection(Request &req, Response &resp)