Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-29 01:08:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1388 from RetroShare/v0.6.5

Browse source 
V0.6.5
This commit is contained in:
csoler 2018-11-02 20:28:31 +01:00 • committed by GitHub
commit 38a81047ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libbitdht/src/bitdht/bdnode.cc
View file

@ -1266,11 +1266,7 @@ void bdNode::recvPkt(char *msg, int len, struct sockaddr_in addr)
/************************** handle id (all) ***************************/ /************************** handle id (all) ***************************/
be_node *be_id = beMsgGetDictNode(be_data, "id"); be_node *be_id = beMsgGetDictNode(be_data, "id");
bdNodeId id; bdNodeId id;
if (be_id) if(!be_id || !beMsgGetNodeId(be_id, id))
{
beMsgGetNodeId(be_id, id);
}
else
{ {
#ifdef DEBUG_NODE_PARSE #ifdef DEBUG_NODE_PARSE
std::cerr << "bdNode::recvPkt() Missing Peer Id. Dropping Msg"; std::cerr << "bdNode::recvPkt() Missing Peer Id. Dropping Msg";

1
libretroshare/src/grouter/p3grouter.cc
View file

@ -1734,6 +1734,7 @@ void p3GRouter::handleIncomingDataItem(RsGRouterGenericDataItem *data_item)
receipt_item = new RsGRouterSignedReceiptItem; receipt_item = new RsGRouterSignedReceiptItem;
receipt_item->data_hash = item_hash ; receipt_item->data_hash = item_hash ;
receipt_item->service_id = data_item->service_id ;
receipt_item->routing_id = data_item->routing_id ; receipt_item->routing_id = data_item->routing_id ;
receipt_item->destination_key = data_item->signature.keyId ; receipt_item->destination_key = data_item->signature.keyId ;
receipt_item->flags = 0 ; receipt_item->flags = 0 ;

3
libretroshare/src/pqi/p3peermgr.cc
View file

@ -1673,6 +1673,7 @@ bool p3PeerMgrIMPL::addCandidateForOwnExternalAddress(const RsPeerId &from, cons
bool p3PeerMgrIMPL::locked_computeCurrentBestOwnExtAddressCandidate(sockaddr_storage& addr, uint32_t& count) bool p3PeerMgrIMPL::locked_computeCurrentBestOwnExtAddressCandidate(sockaddr_storage& addr, uint32_t& count)
{ {
sockaddr_storage_clear(addr);
std::map<sockaddr_storage, pqi::ZeroedInt> addr_counts ; std::map<sockaddr_storage, pqi::ZeroedInt> addr_counts ;
for(std::map<RsPeerId,sockaddr_storage>::iterator it(mReportedOwnAddresses.begin());it!=mReportedOwnAddresses.end();++it) for(std::map<RsPeerId,sockaddr_storage>::iterator it(mReportedOwnAddresses.begin());it!=mReportedOwnAddresses.end();++it)
@ -1697,7 +1698,7 @@ bool p3PeerMgrIMPL::locked_computeCurrentBestOwnExtAddressCandidate(sockaddr_sto
#endif #endif
} }
return true ; return count > 0 ;
} }
bool p3PeerMgrIMPL::getExtAddressReportedByFriends(sockaddr_storage &addr, uint8_t& /*isstable*/) bool p3PeerMgrIMPL::getExtAddressReportedByFriends(sockaddr_storage &addr, uint8_t& /*isstable*/)

5
libretroshare/src/pqi/pqissl.cc
View file

@ -939,8 +939,9 @@ int pqissl::Basic_Connection_Complete()
} }
else if ((err == EHOSTUNREACH) || (err == EHOSTDOWN)) else if ((err == EHOSTUNREACH) || (err == EHOSTDOWN))
{ {
#ifdef PQISSL_DEBUG
rslog(RSL_WARNING, pqisslzone, "pqissl::Basic_Connection_Complete() EHOSTUNREACH/EHOSTDOWN: cert: " + PeerId().toStdString()); rslog(RSL_WARNING, pqisslzone, "pqissl::Basic_Connection_Complete() EHOSTUNREACH/EHOSTDOWN: cert: " + PeerId().toStdString());
#endif
// Then send unreachable message. // Then send unreachable message.
net_internal_close(sockfd); net_internal_close(sockfd);
sockfd=-1; sockfd=-1;
@ -951,7 +952,9 @@ int pqissl::Basic_Connection_Complete()
} }
else if (err == ECONNREFUSED) else if (err == ECONNREFUSED)
{ {
#ifdef PQISSL_DEBUG
rslog(RSL_WARNING, pqisslzone, "pqissl::Basic_Connection_Complete() ECONNREFUSED: cert: " + PeerId().toStdString()); rslog(RSL_WARNING, pqisslzone, "pqissl::Basic_Connection_Complete() ECONNREFUSED: cert: " + PeerId().toStdString());
#endif
// Then send unreachable message. // Then send unreachable message.
net_internal_close(sockfd); net_internal_close(sockfd);

2
libretroshare/src/util/rsrecogn.cc
View file

@ -104,7 +104,7 @@ bool RsRecogn::loadSigningKeys(std::map<RsGxsId, RsGxsRecognSignerItem *> &signM
if (!item) if (!item)
{ {
#ifdef DEBUG_RECOGN #ifdef DEBUG_RECOGN
std::cerr << "RsRecogn::loadSigningKeys() failed to deserialise SignerItem"; std::cerr << "RsRecogn::loadSigningKeys() failed to deserialise SignerItem from string \"" << RecognSigningKeys[i] << "\"";
std::cerr << std::endl; std::cerr << std::endl;
#endif // DEBUG_RECOGN #endif // DEBUG_RECOGN
continue; continue;

5
retroshare-gui/src/gui/HomePage.cpp
View file

@ -48,7 +48,8 @@
HomePage::HomePage(QWidget *parent) : HomePage::HomePage(QWidget *parent) :
MainPage(parent), MainPage(parent),
ui(new Ui::HomePage) ui(new Ui::HomePage),
mIncludeAllIPs(false)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -81,8 +82,6 @@ HomePage::HomePage(QWidget *parent) :
ui->runStartWizard_PB->hide(); // until future rework ui->runStartWizard_PB->hide(); // until future rework
ui->LoadCertFileButton->hide(); // duplicates functionality => not good. ui->LoadCertFileButton->hide(); // duplicates functionality => not good.
mIncludeAllIPs = false;
int S = QFontMetricsF(font()).height(); int S = QFontMetricsF(font()).height();
QString help_str = tr( QString help_str = tr(
" <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Welcome to Retroshare!</h1>\ " <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Welcome to Retroshare!</h1>\