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

add logs

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:42:44 +00:00
parent 3e395f5df4
commit ff87287af4
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libretroshare/src/pqi/p3connmgr.cc
View File

@ -3059,10 +3059,10 @@ bool p3ConnectMgr::checkNetAddress()
bool found = false; bool found = false;
for(it = addrs.begin(); (!found) && (it != addrs.end()); it++) for(it = addrs.begin(); (!found) && (it != addrs.end()); it++)
{ {
// #ifdef CONN_DEBUG #ifdef CONN_DEBUG
// std::cerr << "p3ConnectMgr::checkNetAddress() Local Interface: " << *it; std::cerr << "p3ConnectMgr::checkNetAddress() Local Interface: " << *it;
// std::cerr << std::endl; std::cerr << std::endl;
// #endif #endif
// Ive added the 'isNotLoopbackNet' to prevent re-using the lo address if this was saved in the // Ive added the 'isNotLoopbackNet' to prevent re-using the lo address if this was saved in the
// configuration. In such a case, lo should only be chosen from getPreferredInterface as a last resort // configuration. In such a case, lo should only be chosen from getPreferredInterface as a last resort
@ -3071,14 +3071,6 @@ bool p3ConnectMgr::checkNetAddress()
if ((!isLoopbackNet(&ownState.localaddr.sin_addr)) && (*it) == inet_ntoa(ownState.localaddr.sin_addr)) if ((!isLoopbackNet(&ownState.localaddr.sin_addr)) && (*it) == inet_ntoa(ownState.localaddr.sin_addr))
{ {
found = true; found = true;
if (netFlagLocalOk != true) {
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() changing netFlagOk to true.";
std::cerr << std::endl;
#endif
netFlagLocalOk = true;
IndicateConfigChanged();
}
} }
} }
/* check that we didn't catch 0.0.0.0 - if so go for prefered */ /* check that we didn't catch 0.0.0.0 - if so go for prefered */
@ -3087,19 +3079,27 @@ bool p3ConnectMgr::checkNetAddress()
found = false; found = false;
} }
if (!found) if (found)
{ {
if (netFlagLocalOk != true) {
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() changing netFlagOk to true.";
std::cerr << std::endl;
#endif
netFlagLocalOk = true;
IndicateConfigChanged();
}
} else {
ownState.localaddr.sin_addr = getPreferredInterface(); ownState.localaddr.sin_addr = getPreferredInterface();
#ifdef CONN_DEBUG
// #ifdef CONN_DEBUG std::cerr << "p3ConnectMgr::checkNetAddress() Local Address Not Found: Using Preferred Interface: ";
// std::cerr << "p3ConnectMgr::checkNetAddress() Local Address Not Found: Using Preferred Interface: "; std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
// std::cerr << inet_ntoa(ownState.localaddr.sin_addr); std::cerr << std::endl;
// std::cerr << std::endl; #endif
// #endif
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
} }
if (isLoopbackNet(&(ownState.localaddr.sin_addr))) if (isLoopbackNet(&(ownState.localaddr.sin_addr)))
{ {
mNetStatus = RS_NET_LOOPBACK; mNetStatus = RS_NET_LOOPBACK;
@ -3115,7 +3115,6 @@ bool p3ConnectMgr::checkNetAddress()
* are the same (modify server)... this mismatch can * are the same (modify server)... this mismatch can
* occur when the local port is changed.... * occur when the local port is changed....
*/ */
if (ownState.localaddr.sin_addr.s_addr == if (ownState.localaddr.sin_addr.s_addr ==
ownState.serveraddr.sin_addr.s_addr) ownState.serveraddr.sin_addr.s_addr)
{ {
@ -3127,19 +3126,18 @@ bool p3ConnectMgr::checkNetAddress()
ownState.localaddr.sin_family = AF_INET; ownState.localaddr.sin_family = AF_INET;
ownState.serveraddr.sin_family = AF_INET; ownState.serveraddr.sin_family = AF_INET;
// #ifdef CONN_DEBUG #ifdef CONN_DEBUG
// std::cerr << "p3ConnectMgr::checkNetAddress() Final Local Address: "; std::cerr << "p3ConnectMgr::checkNetAddress() Final Local Address: ";
// std::cerr << inet_ntoa(ownState.localaddr.sin_addr); std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
// std::cerr << ":" << ntohs(ownState.localaddr.sin_port); std::cerr << ":" << ntohs(ownState.localaddr.sin_port);
// std::cerr << std::endl; std::cerr << std::endl;
// #endif #endif
} }
if ((old_in_addr != ownState.localaddr.sin_addr.s_addr) || (old_in_port != ownState.localaddr.sin_port)) { if ((old_in_addr != ownState.localaddr.sin_addr.s_addr) || (old_in_port != ownState.localaddr.sin_port)) {
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::checkNetAddress() local address changed, resetting network." << std::endl; std::cerr << "p3ConnectMgr::checkNetAddress() local address changed, resetting network." << std::endl;
#endif #endif
//local address changed, resetting network
netReset(); netReset();
} }