mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-24 00:31:32 -04:00
Addition of a new Automatic DHT Bootstrap system. This will need to be tweaked as the numbers of users increase.
* hashed keys are posted to specific DHT entries, to create a series of bootstrap lists. * these are fetched as needed to bootstrap new clients. * Modified Bootstrap monitor program. Created a minimal backup bootstrap list (temporary) Added "-e" option to commandline to force 'external port' mode Bugfix for multiple connection methods, could kill an active connection. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
22aff3aa60
commit
247e583a35
8 changed files with 783 additions and 104 deletions
|
@ -216,9 +216,6 @@ int pqiperson::notifyEvent(NetInterface *ni, int newState)
|
|||
case CONNECT_FIREWALLED:
|
||||
case CONNECT_FAILED:
|
||||
|
||||
/* notify up */
|
||||
if (pqipg)
|
||||
pqipg->notifyConnect(PeerId(), false);
|
||||
|
||||
if (active)
|
||||
{
|
||||
|
@ -228,13 +225,13 @@ int pqiperson::notifyEvent(NetInterface *ni, int newState)
|
|||
"CONNECT_FAILED->marking so!");
|
||||
active = false;
|
||||
activepqi = NULL;
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
pqioutput(PQL_WARNING, pqipersonzone,
|
||||
"CONNECT_FAIL+not activepqi->strange!");
|
||||
// something strange!
|
||||
// probably UDP connect has failed,
|
||||
// TCP connection has been made since attempt started.
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
@ -242,10 +239,14 @@ int pqiperson::notifyEvent(NetInterface *ni, int newState)
|
|||
{
|
||||
pqioutput(PQL_WARNING, pqipersonzone,
|
||||
"CONNECT_FAILED+NOT active -> try connect again");
|
||||
|
||||
//connectattempt(pqi);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* notify up (But not if we are actually active: rtn -1 case above) */
|
||||
if (pqipg)
|
||||
pqipg->notifyConnect(PeerId(), false);
|
||||
|
||||
return 1;
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -361,6 +362,7 @@ int pqiperson::connect(uint32_t type, struct sockaddr_in raddr, uint32_t delay,
|
|||
}
|
||||
|
||||
/* set the parameters */
|
||||
(it->second)->reset();
|
||||
(it->second)->connect_parameter(NET_PARAM_CONNECT_DELAY, delay);
|
||||
(it->second)->connect_parameter(NET_PARAM_CONNECT_PERIOD, period);
|
||||
(it->second)->connect(raddr);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue