From 83a143476ebe1e8922b4af63dc334d5c7ae675cc Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 9 Jun 2016 23:23:51 -0400 Subject: [PATCH] fixed bug in setting MaxRate values --- libretroshare/src/pqi/p3peermgr.cc | 11 ++--- libretroshare/src/pqi/p3peermgr.h | 12 +++--- libretroshare/src/retroshare/rspeers.h | 3 -- libretroshare/src/rsserver/p3peers.cc | 3 -- .../src/gui/connect/PGPKeyDialog.cpp | 42 ++++--------------- 5 files changed, 17 insertions(+), 54 deletions(-) diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc index 2078d1cea..4481e7a50 100644 --- a/libretroshare/src/pqi/p3peermgr.cc +++ b/libretroshare/src/pqi/p3peermgr.cc @@ -2116,18 +2116,15 @@ bool p3PeerMgrIMPL::setMaxRates(const RsPgpId& pid,uint32_t maxUp,uint32_t maxDn { RsStackMutex stack(mPeerMtx); /****** STACK LOCK MUTEX *******/ - std::map::iterator it = mPeerBandwidthLimits.find(pid) ; + PeerBandwidthLimits& p(mPeerBandwidthLimits[pid]) ; - if(mPeerBandwidthLimits.end() == it) - return false ; - - if(maxUp == it->second.max_up_rate_kbs && maxDn == it->second.max_dl_rate_kbs) + if(maxUp == p.max_up_rate_kbs && maxDn == p.max_dl_rate_kbs) return true ; std::cerr << "Updating max rates for peer " << pid << " to " << maxUp << " kB/s (up), " << maxDn << " kB/s (dn)" << std::endl; - it->second.max_up_rate_kbs = maxUp ; - it->second.max_dl_rate_kbs = maxDn ; + p.max_up_rate_kbs = maxUp ; + p.max_dl_rate_kbs = maxDn ; IndicateConfigChanged(); diff --git a/libretroshare/src/pqi/p3peermgr.h b/libretroshare/src/pqi/p3peermgr.h index bebae5d45..62c194bbf 100644 --- a/libretroshare/src/pqi/p3peermgr.h +++ b/libretroshare/src/pqi/p3peermgr.h @@ -209,9 +209,9 @@ virtual uint32_t getHiddenType(const RsPeerId &ssl_id) = 0; virtual int getFriendCount(bool ssl, bool online) = 0; -virtual bool setMaxRates(const RsPgpId& pid,uint32_t maxR,uint32_t minR)=0; -virtual bool getMaxRates(const RsPgpId& pid,uint32_t& maxR,uint32_t& minR)=0; -virtual bool getMaxRates(const RsPeerId& pid,uint32_t& maxR,uint32_t& minR)=0; +virtual bool setMaxRates(const RsPgpId& pid,uint32_t maxUp,uint32_t maxDn)=0; +virtual bool getMaxRates(const RsPgpId& pid,uint32_t& maxUp,uint32_t& maxDn)=0; +virtual bool getMaxRates(const RsPeerId& pid,uint32_t& maxUp,uint32_t& maxDn)=0; /************* DEPRECIATED FUNCTIONS (TO REMOVE) ********/ @@ -326,9 +326,9 @@ virtual int getFriendCount(bool ssl, bool online); // Single Use Function... shouldn't be here. used by p3serverconfig.cc virtual bool haveOnceConnected(); -virtual bool setMaxRates(const RsPgpId& pid,uint32_t maxR,uint32_t minR); -virtual bool getMaxRates(const RsPgpId& pid,uint32_t& maxR,uint32_t& minR); -virtual bool getMaxRates(const RsPeerId& pid,uint32_t& maxR,uint32_t& minR); +virtual bool setMaxRates(const RsPgpId& pid,uint32_t maxUp,uint32_t maxDn); +virtual bool getMaxRates(const RsPgpId& pid,uint32_t& maxUp,uint32_t& maxDn); +virtual bool getMaxRates(const RsPeerId& pid,uint32_t& maxUp,uint32_t& maxDn); /************************************************************************************************/ /* Extra IMPL Functions (used by p3LinkMgr, p3NetMgr + Setup) */ diff --git a/libretroshare/src/retroshare/rspeers.h b/libretroshare/src/retroshare/rspeers.h index 40afe177f..3cad47cad 100644 --- a/libretroshare/src/retroshare/rspeers.h +++ b/libretroshare/src/retroshare/rspeers.h @@ -276,9 +276,6 @@ class RsPeerDetails /* linkType */ uint32_t linkType; - - uint32_t maxRateUp; - uint32_t maxRateDn; }; // This class is used to get info about crytographic algorithms used with a diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc index fb8e4753c..1ab54d25c 100644 --- a/libretroshare/src/rsserver/p3peers.cc +++ b/libretroshare/src/rsserver/p3peers.cc @@ -286,9 +286,6 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) return false; } - d.maxRateUp = ps.maxUpRate ; - d.maxRateDn = ps.maxDnRate ; - /* get from gpg (first), to fill in the sign and trust details */ /* don't return now, we've got fill in the ssl and connection info */ getGPGDetails(ps.gpg_id, d); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index 65e512600..d5774b719 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -145,26 +145,8 @@ void PGPKeyDialog::load() ui.make_friend_button->setToolTip("") ; } - - //ui._direct_transfer_CB->setChecked( detail.service_perm_flags & RS_NODE_PERM_DIRECT_DL ) ; - //ui._allow_push_CB->setChecked( detail.service_perm_flags & RS_NODE_PERM_ALLOW_PUSH) ; - ui.name->setText(QString::fromUtf8(detail.name.c_str())); - //ui.peerid->setText(QString::fromStdString(detail.id.toStdString())); - - //RetroShareLink link; - //link.createPerson(detail.gpg_id); - - //ui.rsid->setText(QString::fromStdString(detail.gpg_id.toStdString())) ; ui.pgpfingerprint->setText(misc::fingerPrintStyleSplit(QString::fromStdString(detail.fpr.toStdString()))); - //ui.rsid->setToolTip(link.title()); - - //ui.avatar->setId(pgpId.toStdString(), true); - - // ui.rsid->show(); - // ui.peerid->hide(); - // ui.label_id->hide(); - // ui.label_rsid->show(); ui.pgpfingerprint->show(); ui.pgpfingerprint_label->show(); @@ -173,24 +155,14 @@ void PGPKeyDialog::load() ui._allow_push_CB->setChecked( detail.service_perm_flags & RS_NODE_PERM_ALLOW_PUSH) ; ui._require_WL_CB->setChecked( detail.service_perm_flags & RS_NODE_PERM_REQUIRE_WL) ; - ui.maxUploadSpeed_SB->setValue(detail.maxRateUp) ; - ui.maxDownloadSpeed_SB->setValue(detail.maxRateDn) ; + uint32_t max_upload_speed = 0 ; + uint32_t max_download_speed = 0 ; + + rsPeers->getPeerMaximumRates(pgpId,max_upload_speed,max_download_speed); + + ui.maxUploadSpeed_SB->setValue(max_upload_speed) ; + ui.maxDownloadSpeed_SB->setValue(max_download_speed) ; - // ui.loc->hide(); - // ui.label_loc->hide(); - // ui.statusline->hide(); - // ui.label_status->hide(); - // ui.lastcontact->hide(); - // ui.label_last_contact->hide(); - // ui.version->hide(); - // ui.label_version->hide(); - // ui.groupBox_4->hide(); - // ui.crypto_info->hide(); - // ui.crypto_label->hide(); - - // ui.groupBox->hide(); - // ui.tabWidget->hide(); - if (detail.gpg_id == rsPeers->getGPGOwnId()) { ui.make_friend_button->hide();