Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add loopback network interface compatibility

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:36:56 +00:00
parent b8be372c4d
commit 20cff8ecbd
2 changed files with 135 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

205
libretroshare/src/pqi/p3connmgr.cc
View file

@ -39,12 +39,14 @@ const int p3connectzone = 3431;
/* Network setup States */ /* Network setup States */
const uint32_t RS_NET_NEED_RESET = 0x0000;
const uint32_t RS_NET_UNKNOWN = 0x0001; const uint32_t RS_NET_UNKNOWN = 0x0001;
const uint32_t RS_NET_UPNP_INIT = 0x0002; const uint32_t RS_NET_UPNP_INIT = 0x0002;
const uint32_t RS_NET_UPNP_SETUP = 0x0003; const uint32_t RS_NET_UPNP_SETUP = 0x0003;
const uint32_t RS_NET_UDP_SETUP = 0x0004; const uint32_t RS_NET_UDP_SETUP = 0x0004;
const uint32_t RS_NET_DONE = 0x0005; const uint32_t RS_NET_DONE = 0x0005;
const uint32_t RS_NET_LOOPBACK = 0x0006;
const uint32_t RS_NET_MODE_DOWN = 0x0007;
/* Stun modes (TODO) */ /* Stun modes (TODO) */
const uint32_t RS_STUN_DHT = 0x0001; const uint32_t RS_STUN_DHT = 0x0001;
@ -52,10 +54,10 @@ const uint32_t RS_STUN_DONE = 0x0002;
const uint32_t RS_STUN_LIST_MIN = 100; const uint32_t RS_STUN_LIST_MIN = 100;
const uint32_t RS_STUN_FOUND_MIN = 10; const uint32_t RS_STUN_FOUND_MIN = 10;
const uint32_t MAX_UPNP_INIT = 120; /* seconds UPnP timeout */ const uint32_t MAX_UPNP_INIT = 100; /* seconds UPnP timeout */
const uint32_t MAX_UDP_INIT = 150; /* seconds Udp timeout */ const uint32_t MAX_UDP_INIT = 120; /* seconds Udp timeout */
const uint32_t MIN_TIME_BETWEEN_NET_RESET = 150; /* seconds Udp timeout */ const uint32_t MIN_TIME_BETWEEN_NET_RESET = 20; /* seconds Udp timeout */
/**** /****
* #define CONN_DEBUG 1 * #define CONN_DEBUG 1
@ -130,6 +132,7 @@ p3ConnectMgr::p3ConnectMgr(p3AuthMgr *am)
mStunStatus(0), mStunFound(0), mStunMoreRequired(true), mStunStatus(0), mStunFound(0), mStunMoreRequired(true),
mStatusChanged(false) mStatusChanged(false)
{ {
netFlagOk = false;
mUpnpAddrValid = false; mUpnpAddrValid = false;
mStunAddrValid = false; mStunAddrValid = false;
mStunAddrStable = false; mStunAddrStable = false;
@ -283,6 +286,10 @@ void p3ConnectMgr::netReset()
std::cerr << "p3ConnectMgr time since last reset : " << delta << std::endl; std::cerr << "p3ConnectMgr time since last reset : " << delta << std::endl;
#endif #endif
if (delta < MIN_TIME_BETWEEN_NET_RESET) { if (delta < MIN_TIME_BETWEEN_NET_RESET) {
{
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
mNetStatus = RS_NET_NEED_RESET;
}
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::netStartup() don't do a net reset if the MIN_TIME_BETWEEN_NET_RESET is not reached" << std::endl; std::cerr << "p3ConnectMgr::netStartup() don't do a net reset if the MIN_TIME_BETWEEN_NET_RESET is not reached" << std::endl;
#endif #endif
@ -299,6 +306,7 @@ void p3ConnectMgr::netReset()
{ {
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
mNetStatus = RS_NET_UNKNOWN; mNetStatus = RS_NET_UNKNOWN;
netFlagOk = false;
} }
std::cerr << "p3ConnectMgr::netReset() checkNetAddress" << std::endl; std::cerr << "p3ConnectMgr::netReset() checkNetAddress" << std::endl;
@ -338,7 +346,6 @@ void p3ConnectMgr::addNetListener(pqiNetListener *listener)
void p3ConnectMgr::netStatusReset() void p3ConnectMgr::netStatusReset()
{ {
netFlagOk = true;
netFlagUpnpOk = false; netFlagUpnpOk = false;
netFlagDhtOk = false; netFlagDhtOk = false;
netFlagExtOk = false; netFlagExtOk = false;
@ -415,6 +422,7 @@ bool p3ConnectMgr::shutdown() /* blocking shutdown call */
connMtx.lock(); /* LOCK MUTEX */ connMtx.lock(); /* LOCK MUTEX */
bool upnpActive = ownState.netMode & RS_NET_MODE_UPNP; bool upnpActive = ownState.netMode & RS_NET_MODE_UPNP;
mNetStatus = RS_NET_MODE_DOWN;
connMtx.unlock(); /* UNLOCK MUTEX */ connMtx.unlock(); /* UNLOCK MUTEX */
@ -503,8 +511,9 @@ void p3ConnectMgr::netTick()
// the computer is not yet connected to the internet. In such a case we // the computer is not yet connected to the internet. In such a case we
// periodically check for a local net address. // periodically check for a local net address.
// //
if(isLoopbackNet(&(ownState.localaddr.sin_addr)))
checkNetAddress() ; // if(isLoopbackNet(&(ownState.localaddr.sin_addr)))
checkNetAddress() ;
connMtx.lock(); /* LOCK MUTEX */ connMtx.lock(); /* LOCK MUTEX */
@ -514,15 +523,18 @@ void p3ConnectMgr::netTick()
switch(netStatus) switch(netStatus)
{ {
case RS_NET_UNKNOWN: case RS_NET_NEED_RESET:
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::netTick() STATUS: NEED_RESET" << std::endl;
#endif
netReset();
break;
case RS_NET_UNKNOWN:
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::netTick() STATUS: UNKNOWN" << std::endl; std::cerr << "p3ConnectMgr::netTick() STATUS: UNKNOWN" << std::endl;
#endif #endif
/* RS_NET_UNKNOWN -(config)-> RS_NET_EXT_INIT
* RS_NET_UNKNOWN -(config)-> RS_NET_UPNP_INIT
* RS_NET_UNKNOWN -(config)-> RS_NET_UDP_INIT
*/
netStartup(); netStartup();
break; break;
@ -552,6 +564,14 @@ void p3ConnectMgr::netTick()
//std::cerr << "p3ConnectMgr::netTick() STATUS: DONE" << std::endl; //std::cerr << "p3ConnectMgr::netTick() STATUS: DONE" << std::endl;
#endif #endif
stunCheck(); /* Keep on stunning until its happy */ stunCheck(); /* Keep on stunning until its happy */
break;
case RS_NET_LOOPBACK:
shutdown();
#ifdef CONN_DEBUG
//std::cerr << "p3ConnectMgr::netTick() STATUS: DONE" << std::endl;
#endif
//do nothing, there is already a checkNetAddress() in the tick
default: default:
break; break;
} }
@ -3013,88 +3033,102 @@ bool p3ConnectMgr::checkNetAddress()
std::list<std::string> addrs = getLocalInterfaces(); std::list<std::string> addrs = getLocalInterfaces();
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ in_addr_t old_in_addr = ownState.localaddr.sin_addr.s_addr;
in_port_t old_in_port = ownState.localaddr.sin_port;
bool found = false;
for(it = addrs.begin(); (!found) && (it != addrs.end()); it++)
{ {
#ifdef CONN_DEBUG RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
std::cerr << "p3ConnectMgr::checkNetAddress() Local Interface: " << *it;
std::cerr << std::endl;
#endif
// Ive added the 'isNotLoopbackNet' to prevent re-using the lo address if this was saved in the bool found = false;
// configuration. In such a case, lo should only be chosen from getPreferredInterface as a last resort for(it = addrs.begin(); (!found) && (it != addrs.end()); it++)
// fallback solution. {
// #ifdef CONN_DEBUG
if ((!isLoopbackNet(&ownState.localaddr.sin_addr)) && (*it) == inet_ntoa(ownState.localaddr.sin_addr)) std::cerr << "p3ConnectMgr::checkNetAddress() Local Interface: " << *it;
{ std::cerr << std::endl;
#ifdef CONN_DEBUG #endif
std::cerr << "p3ConnectMgr::checkNetAddress() Matches Existing Address! FOUND = true";
std::cerr << std::endl; // Ive added the 'isNotLoopbackNet' to prevent re-using the lo address if this was saved in the
#endif // configuration. In such a case, lo should only be chosen from getPreferredInterface as a last resort
found = true; // fallback solution.
} //
if ((!isLoopbackNet(&ownState.localaddr.sin_addr)) && (*it) == inet_ntoa(ownState.localaddr.sin_addr))
{
found = true;
if (netFlagOk != true) {
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() changing netFlagOk to true.";
std::cerr << std::endl;
#endif
netFlagOk = true;
IndicateConfigChanged();
}
}
}
/* check that we didn't catch 0.0.0.0 - if so go for prefered */
if ((found) && (ownState.localaddr.sin_addr.s_addr == 0))
{
found = false;
}
if (!found)
{
ownState.localaddr.sin_addr = getPreferredInterface();
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() Local Address Not Found: Using Preferred Interface: ";
std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
std::cerr << std::endl;
#endif
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
}
if (isLoopbackNet(&(ownState.localaddr.sin_addr)))
{
mNetStatus = RS_NET_LOOPBACK;
}
int port = ntohs(ownState.localaddr.sin_port);
if ((port < PQI_MIN_PORT) || (port > PQI_MAX_PORT))
{
ownState.localaddr.sin_port = htons(PQI_DEFAULT_PORT);
}
/* if localaddr = serveraddr, then ensure that the ports
* are the same (modify server)... this mismatch can
* occur when the local port is changed....
*/
if (ownState.localaddr.sin_addr.s_addr ==
ownState.serveraddr.sin_addr.s_addr)
{
ownState.serveraddr.sin_port =
ownState.localaddr.sin_port;
}
// ensure that address family is set, otherwise windows Barfs.
ownState.localaddr.sin_family = AF_INET;
ownState.serveraddr.sin_family = AF_INET;
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() Final Local Address: ";
std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
std::cerr << ":" << ntohs(ownState.localaddr.sin_port);
std::cerr << std::endl;
#endif
} }
/* check that we didn't catch 0.0.0.0 - if so go for prefered */
if ((found) && (ownState.localaddr.sin_addr.s_addr == 0))
{
found = false;
}
if (!found)
{
ownState.localaddr.sin_addr = getPreferredInterface();
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() Local Address Not Found: Using Preferred Interface: "; std::cerr << "old_in_addr : " << old_in_addr << std::endl;
std::cerr << inet_ntoa(ownState.localaddr.sin_addr); std::cerr << "ownState.localaddr.sin_addr.s_addr : " << ownState.localaddr.sin_addr.s_addr << std::endl;
std::cerr << std::endl; std::cerr << "old_in_port : " << old_in_port << std::endl;
std::cerr << "ownState.localaddr.sin_port : " << ownState.localaddr.sin_port << std::endl;
#endif #endif
if ((old_in_addr != ownState.localaddr.sin_addr.s_addr) || (old_in_port != ownState.localaddr.sin_port)) {
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ //local address changed, resetting network
netReset();
}
if ((isPrivateNet(&(ownState.localaddr.sin_addr))) ||
(isLoopbackNet(&(ownState.localaddr.sin_addr))))
{
/* firewalled */
//own_cert -> Firewalled(true);
}
else
{
//own_cert -> Firewalled(false);
} }
int port = ntohs(ownState.localaddr.sin_port);
if ((port < PQI_MIN_PORT) || (port > PQI_MAX_PORT))
{
ownState.localaddr.sin_port = htons(PQI_DEFAULT_PORT);
}
/* if localaddr = serveraddr, then ensure that the ports
* are the same (modify server)... this mismatch can
* occur when the local port is changed....
*/
if (ownState.localaddr.sin_addr.s_addr ==
ownState.serveraddr.sin_addr.s_addr)
{
ownState.serveraddr.sin_port =
ownState.localaddr.sin_port;
}
// ensure that address family is set, otherwise windows Barfs.
ownState.localaddr.sin_family = AF_INET;
ownState.serveraddr.sin_family = AF_INET;
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() Final Local Address: ";
std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
std::cerr << ":" << ntohs(ownState.localaddr.sin_port);
std::cerr << std::endl;
#endif
return 1; return 1;
} }
@ -3555,6 +3589,7 @@ bool p3ConnectMgr::getDHTEnabled()
bool p3ConnectMgr::getNetStatusOk() bool p3ConnectMgr::getNetStatusOk()
{ {
std::cerr << "netFlagOk : " << netFlagOk << std::endl;
return netFlagOk; return netFlagOk;
} }

33
libretroshare/src/upnp/upnphandler.cc
View file

@ -21,30 +21,27 @@ bool upnphandler::initUPnPState()
bool IGWDetected = cUPnPControlPoint->GetIGWDeviceDetected(); bool IGWDetected = cUPnPControlPoint->GetIGWDeviceDetected();
/* MODIFY STATE */
dataMtx.lock(); /* LOCK MUTEX */
std::cerr << "upnphandler::initUPnPState cUPnPControlPoint internal ip adress : ";
std::cerr << cUPnPControlPoint->getInternalIpAddress() << std::endl;
//const char ipaddr = cUPnPControlPoint->getInternalIpAddress().c_str();
inet_aton(cUPnPControlPoint->getInternalIpAddress(), &(upnp_iaddr.sin_addr));
upnp_iaddr.sin_port = htons(iport);
if (IGWDetected) { if (IGWDetected) {
upnpState = RS_UPNP_S_READY; upnpState = RS_UPNP_S_READY;
std::cerr << "upnphandler::initUPnPState READY" << std::endl;
/* MODIFY STATE */
dataMtx.lock(); /* LOCK MUTEX */
std::cerr << "upnphandler::initUPnPState cUPnPControlPoint internal ip adress : ";
std::cerr << cUPnPControlPoint->getInternalIpAddress() << std::endl;
//const char ipaddr = cUPnPControlPoint->getInternalIpAddress().c_str();
inet_aton(cUPnPControlPoint->getInternalIpAddress(), &(upnp_iaddr.sin_addr));
upnp_iaddr.sin_port = htons(iport);
dataMtx.unlock(); /* UNLOCK MUTEX */
} else { } else {
upnpState = RS_UPNP_S_UNAVAILABLE; upnpState = RS_UPNP_S_UNAVAILABLE;
}
dataMtx.unlock(); /* UNLOCK MUTEX */
/* done, NOT AVAILABLE YET */
if (upnpState == RS_UPNP_S_READY) {
std::cerr << "upnphandler::initUPnPState READY" << std::endl;
} else {
std::cerr << "upnphandler::initUPnPState UNAVAILABLE" << std::endl; std::cerr << "upnphandler::initUPnPState UNAVAILABLE" << std::endl;
} }
return 0; return 0;
} }