Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 06:31:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

15
libretroshare/src/pqi/p3netmgr.cc
View file

@ -1083,6 +1083,14 @@ bool p3NetMgrIMPL::checkNetAddress()
RsInfo() << __PRETTY_FUNCTION__ << " local address changed, resetting" RsInfo() << __PRETTY_FUNCTION__ << " local address changed, resetting"
<<" network." << std::endl; <<" 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); if (mPeerMgr) mPeerMgr->UpdateOwnAddress(mLocalAddr, mExtAddr);
netReset(); netReset();
@ -1123,13 +1131,6 @@ bool p3NetMgrIMPL::setLocalAddress(const struct sockaddr_storage &addr)
#ifdef NETMGR_DEBUG_RESET #ifdef NETMGR_DEBUG_RESET
std::cerr << "p3NetMgrIMPL::setLocalAddress() Calling NetReset" << std::endl; std::cerr << "p3NetMgrIMPL::setLocalAddress() Calling NetReset" << std::endl;
#endif #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"); rslog(RSL_WARNING, p3netmgrzone, "p3NetMgr::setLocalAddress() local address changed, resetting network");
netReset(); netReset();
} }

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()); const RsNetworkEvent *ne = dynamic_cast<const RsNetworkEvent*>(e.get());
if(ne) if(!ne)
return; return;
// in any case we update the IPs // in any case we update the IPs