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

moved event to the right place for detecting change in local address

Browse Source
This commit is contained in:
csoler 2020-11-11 22:43:07 +01:00
parent 71edea3775
commit 3d958a7592
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/pqi/p3netmgr.cc
View File

@ -1082,7 +1082,15 @@ bool p3NetMgrIMPL::checkNetAddress()
{
RsInfo() << __PRETTY_FUNCTION__ << " local address changed, resetting"
<<" network." << std::endl;
if(rsEvents)
{
auto ev = std::make_shared<RsNetworkEvent>();
ev->mNetworkEventCode = RsNetworkEventCode::LOCAL_IP_UPDATED;
ev->mIPAddress = sockaddr_storage_iptostring(mLocalAddr);
rsEvents->postEvent(ev);
}
if (mPeerMgr) mPeerMgr->UpdateOwnAddress(mLocalAddr, mExtAddr);
netReset();
@ -1123,13 +1131,6 @@ bool p3NetMgrIMPL::setLocalAddress(const struct sockaddr_storage &addr)
#ifdef NETMGR_DEBUG_RESET
std::cerr << "p3NetMgrIMPL::setLocalAddress() Calling NetReset" << std::endl;
#endif
if(rsEvents)
{
auto ev = std::make_shared<RsNetworkEvent>();
ev->mNetworkEventCode = RsNetworkEventCode::LOCAL_IP_UPDATED;
ev->mIPAddress = sockaddr_storage_iptostring(addr);
rsEvents->postEvent(ev);
}
rslog(RSL_WARNING, p3netmgrzone, "p3NetMgr::setLocalAddress() local address changed, resetting network");
netReset();
}

2
libretroshare/src/pqi/p3peermgr.cc
View File

@ -317,7 +317,7 @@ void p3PeerMgrIMPL::tick()
const RsPeerId& p3PeerMgrIMPL::getOwnId()
{
return AuthSSL::getAuthSSL()->OwnId();
return AuthSSL::getAuthSSL()->OwnId();
}

2
retroshare-gui/src/gui/HomePage.cpp
View File

@ -126,7 +126,7 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
const RsNetworkEvent *ne = dynamic_cast<const RsNetworkEvent*>(e.get());
if(ne)
if(!ne)
return;
// in any case we update the IPs