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

Fix number 2 for disconnections: Temporarily Disable Transmission of GPG Certificates in Discovery.

Browse Source 
Certificate transmission will be disabled until we have worked out how to export Minimal Certs.
 * Disabled check for gpgcert text in p3disc.
 * Disabled creation of GPG Cert in AuthGPG.
 * Added extra error code to pqinetwork.

This change will mean that friends of friends certificates will no-longer be shared if you have discovery on.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-01-20 01:05:46 +00:00
parent a7af95c0fd
commit 761bca8678
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/pqi/authgpg.cc
View File

@ -434,7 +434,12 @@ void AuthGPGimpl::processServices()
#endif
/* save the certificate to string */
#define DISABLE_CERTIFICATE_SEND 1
#ifdef DISABLE_CERTIFICATE_SEND
loadOrSave->m_certGpg = "";
#else
loadOrSave->m_certGpg = SaveCertificateToString(loadOrSave->m_certGpgId,true);
#endif
}
service->setGPGOperation(loadOrSave);

4
libretroshare/src/pqi/pqinetwork.cc
View File

@ -134,6 +134,10 @@ std::string socket_errorType(int err)
{
return std::string("EHOSTUNREACH");
}
else if (err == EADDRNOTAVAIL)
{
return std::string("EADDRNOTAVAIL");
}
//
return std::string("UNKNOWN ERROR CODE - ASK RS-DEVS TO ADD IT!");

10
libretroshare/src/services/p3disc.cc
View File

@ -960,14 +960,20 @@ void p3disc::setGPGOperation(AuthGPGOperation *operation)
} else {
RsDiscReply *item = (RsDiscReply*) loadOrSave->m_userdata;
if (item) {
if (loadOrSave->m_certGpg.empty()) {
if (item)
{
// It is okay to send an empty certificate! - This is to reduce the network load at connection time.
// Hopefully, we'll get the stripped down certificates working soon!... even then still be okay to send null.
#if 0
if (loadOrSave->m_certGpg.empty())
{
#ifdef P3DISC_DEBUG
std::cerr << "p3disc::setGPGOperation() don't send details because the gpg cert is not good" << std::endl;
#endif
delete item;
return;
}
#endif
// Send off message
item->certGPG = loadOrSave->m_certGpg;