Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 06:35:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added dynamic local and external ip reconfiguration. I still need to reset connexions when changing ips.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-11-06 22:12:58 +00:00
parent ef78f90225
commit ad96c86f68
4 changed files with 131 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libretroshare/src/pqi/pqinetwork.cc
View file

@ -179,6 +179,20 @@ std::list<std::string> getLocalInterfaces()
out << std::endl;
pqioutput(PQL_DEBUG_BASIC, pqinetzone, out.str());
// Now check wether the interface is up and running. If not, we don't use it!!
//
if(ioctl(sock,SIOCGIFFLAGS,&ifreq) != 0)
{
std::cerr << "Could not get flags from interface " << ifptr -> if_name << std::endl ;
continue ;
}
#ifdef NET_DEBUG
std::cout << out.str() ;
std::cout << "flags = " << ifreq.ifr_flags << std::endl ;
#endif
if((ifreq.ifr_flags & IFF_UP) == 0) continue ;
if((ifreq.ifr_flags & IFF_RUNNING) == 0) continue ;
addrs.push_back(astr);
}
}
@ -533,6 +547,9 @@ struct in_addr getPreferredInterface() // returns best addr.
for(it = addrs.begin(); it != addrs.end(); it++)
{
inet_aton((*it).c_str(), &addr);
std::cout << "Examining addr = " << (void*)addr.s_addr << std::endl ;
// for windows silliness (returning 0.0.0.0 as valid addr!).
if (addr.s_addr == 0)
{
@ -562,13 +579,16 @@ struct in_addr getPreferredInterface() // returns best addr.
{
if (!found_ext)
{
std::cerr << "Found external address " << (void*)addr.s_addr << std::endl ;
found_ext = true;
addr_ext = addr;
return addr_ext;
}
}
}
if(found_ext) // external address is best.
return addr_ext ;
if (found_priv)
return addr_priv;