Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 17:21:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified and improve ip list for connect attempt. Show the ip in the gui

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-11-12 11:51:27 +00:00
parent efa84ef24d
commit 5a2dbc4bdf
2 changed files with 25 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2566,153 +2566,11 @@ bool p3ConnectMgr::retryConnectTCP(std::string id)
/* are the addresses different? */ /* are the addresses different? */
time_t now = time(NULL); time_t now = time(NULL);
std::list<peerConnectAddress>::iterator cit;
/* add in attempts ... local(TCP), remote(TCP) /* add in attempts ... local(TCP), remote(TCP)
*/ */
#ifndef P3CONNMGR_NO_TCP_CONNECTIONS #ifndef P3CONNMGR_NO_TCP_CONNECTIONS
/* if address is same -> try local */
if ((isValidNet(&(it->second.currentlocaladdr.sin_addr))) &&
(sameNet(&(ownState.currentlocaladdr.sin_addr),
&(it->second.currentlocaladdr.sin_addr))))
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Local Address Valid: ";
std::cerr << inet_ntoa(it->second.currentlocaladdr.sin_addr);
std::cerr << ":" << ntohs(it->second.currentlocaladdr.sin_port);
std::cerr << std::endl;
#endif
bool localExists = false;
if ((it->second.inConnAttempt) &&
(it->second.currentConnAddrAttempt.type == RS_NET_CONN_TCP_LOCAL))
{
localExists = true;
}
for(cit = it->second.connAddrs.begin();
(!localExists) && (cit != it->second.connAddrs.begin()); cit++)
{
if (cit->type == RS_NET_CONN_TCP_LOCAL)
{
localExists = true;
}
}
/* check if there is a local one on there already */
if (!localExists)
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Adding Local Addr to Queue";
std::cerr << std::endl;
#endif
/* add the local address */
peerConnectAddress pca;
pca.ts = now;
pca.type = RS_NET_CONN_TCP_LOCAL;
pca.addr = it->second.currentlocaladdr;
{
/* Log */
std::ostringstream out;
out << "p3ConnectMgr::retryConnectTCP() PushBack Local TCP Address: ";
out << " id: " << id;
out << " raddr: " << inet_ntoa(pca.addr.sin_addr);
out << ":" << ntohs(pca.addr.sin_port);
out << " type: " << pca.type;
out << " delay: " << pca.delay;
out << " period: " << pca.period;
out << " ts: " << pca.ts;
rslog(RSL_WARNING, p3connectzone, out.str());
}
it->second.connAddrs.push_back(pca);
}
else
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Local Addr already in Queue";
std::cerr << std::endl;
#endif
}
}
/* otherwise try external ... (should check flags) */
//if ((isValidNet(&(it->second.serveraddr.sin_addr))) &&
// (it->second.netMode = RS_NET_MODE_EXT))
/* always try external */
if (isValidNet(&(it->second.currentserveraddr.sin_addr)))
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Ext Address Valid: ";
std::cerr << inet_ntoa(it->second.currentserveraddr.sin_addr);
std::cerr << ":" << ntohs(it->second.currentserveraddr.sin_port);
std::cerr << std::endl;
#endif
bool remoteExists = false;
if ((it->second.inConnAttempt) &&
(it->second.currentConnAddrAttempt.type == RS_NET_CONN_TCP_EXTERNAL))
{
remoteExists = true;
}
for(cit = it->second.connAddrs.begin();
(!remoteExists) && (cit != it->second.connAddrs.begin()); cit++)
{
if (cit->type == RS_NET_CONN_TCP_EXTERNAL)
{
remoteExists = true;
}
}
/* check if there is a local one on there already */
if (!remoteExists)
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Adding Ext Addr to Queue";
std::cerr << std::endl;
#endif
/* add the remote address */
peerConnectAddress pca;
pca.ts = now;
pca.type = RS_NET_CONN_TCP_EXTERNAL;
pca.addr = it->second.currentserveraddr;
{
/* Log */
std::ostringstream out;
out << "p3ConnectMgr::retryConnectTCP() PushBack Ext TCP Address: ";
out << " id: " << id;
out << " raddr: " << inet_ntoa(pca.addr.sin_addr);
out << ":" << ntohs(pca.addr.sin_port);
out << " type: " << pca.type;
out << " delay: " << pca.delay;
out << " period: " << pca.period;
out << " ts: " << pca.ts;
rslog(RSL_WARNING, p3connectzone, out.str());
}
it->second.connAddrs.push_back(pca);
}
else
{
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() Ext Addr already in Queue";
std::cerr << std::endl;
#endif
}
}
//add the ips off the ipAdressList //add the ips off the ipAdressList
std::list<IpAddressTimed> ipList = it->second.getIpAddressList(); std::list<IpAddressTimed> ipList = it->second.getIpAddressList();
for (std::list<IpAddressTimed>::iterator ipListIt = ipList.begin(); ipListIt!=(ipList.end()); ipListIt++) { for (std::list<IpAddressTimed>::iterator ipListIt = ipList.begin(); ipListIt!=(ipList.end()); ipListIt++) {
@ -2722,6 +2580,19 @@ bool p3ConnectMgr::retryConnectTCP(std::string id)
std::cerr << ":" << ntohs(ipListIt->ipAddr.sin_port); std::cerr << ":" << ntohs(ipListIt->ipAddr.sin_port);
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
//check that the address doens't exist already in the connAddrs
bool found = false;
for (std::list<peerConnectAddress>::iterator cit = it->second.connAddrs.begin(); cit != it->second.connAddrs.end(); cit++) {
if (cit->addr.sin_addr.s_addr == ipListIt->ipAddr.sin_addr.s_addr && cit->addr.sin_port == ipListIt->ipAddr.sin_port) {
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::retryConnectTCP() ip already in the conn addr attempt list." << std::endl;
#endif
found = true;
break;
}
}
if (!found) {
peerConnectAddress pca; peerConnectAddress pca;
pca.addr = ipListIt->ipAddr; pca.addr = ipListIt->ipAddr;
pca.type = RS_NET_CONN_TCP_UNKNOW_TOPOLOGY; pca.type = RS_NET_CONN_TCP_UNKNOW_TOPOLOGY;
@ -2730,6 +2601,7 @@ bool p3ConnectMgr::retryConnectTCP(std::string id)
pca.period = 0; pca.period = 0;
it->second.connAddrs.push_back(pca); it->second.connAddrs.push_back(pca);
} }
}
#endif // P3CONNMGR_NO_TCP_CONNECTIONS #endif // P3CONNMGR_NO_TCP_CONNECTIONS
@ -3782,9 +3654,10 @@ void peerConnectState::updateIpAddressList(IpAddressTimed ipTimed) { //purge old
std::cerr << ":" << ntohs(ipTimed.ipAddr.sin_port); std::cerr << ":" << ntohs(ipTimed.ipAddr.sin_port);
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (ipTimed.ipAddr.sin_addr.s_addr == 0 || ipTimed.ipAddr.sin_port == 0) { if (ipTimed.ipAddr.sin_addr.s_addr == 0 || ipTimed.ipAddr.sin_port == 0 ||
std::string(inet_ntoa(ipTimed.ipAddr.sin_addr)) == "1.1.1.1") {
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "peerConnectState::updateIpAdressList() ip parameter is 0.0.0.0 or port is 0, ignoring." << std::endl; std::cerr << "peerConnectState::updateIpAdressList() ip parameter is 0.0.0.0, 1.1.1.1 or port is 0, ignoring." << std::endl;
#endif #endif
return; return;
} }

22
libretroshare/src/rsserver/p3peers.cc
View File

@ -437,27 +437,7 @@ bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
std::ostringstream autostr; std::ostringstream autostr;
if (pcs.inConnAttempt) if (pcs.inConnAttempt)
{ {
/* autostr << "Trying " << inet_ntoa(pcs.currentConnAddrAttempt.addr.sin_addr) << ":" << ntohs(pcs.currentConnAddrAttempt.addr.sin_port);
*/
autostr << "Trying ";
switch(pcs.currentConnAddrAttempt.type)
{
case RS_NET_CONN_TCP_LOCAL:
autostr << "TCP (Local)";
break;
case RS_NET_CONN_TCP_EXTERNAL:
autostr << "TCP (External)";
break;
case RS_NET_CONN_UDP_DHT_SYNC:
autostr << "UDP (ETA: ";
autostr << 420 - (time(NULL) - pcs.currentConnAddrAttempt.ts);
autostr << ")";
break;
default:
autostr << "Unknown";
break;
}
} }
else if (pcs.state & RS_PEER_S_CONNECTED) else if (pcs.state & RS_PEER_S_CONNECTED)
{ {