Correctly cycle through ConnectTo variables.
This commit is contained in:
parent
80b4a851a6
commit
a26081467c
2 changed files with 10 additions and 3 deletions
3
TODO
3
TODO
|
@ -3,6 +3,7 @@ TODO LIST
|
||||||
Goals for 1.0 release:
|
Goals for 1.0 release:
|
||||||
|
|
||||||
* Check Solaris port
|
* Check Solaris port
|
||||||
|
* Check FreeBSD port again
|
||||||
* Check different linux architectures (x86, alpha and sparc32 done)
|
* Check different linux architectures (x86, alpha and sparc32 done)
|
||||||
* Store private key in a separate file (done, 1 dec 2000)
|
* Store private key in a separate file (done, 1 dec 2000)
|
||||||
* Sanity checks on configuration directory (mostly done)
|
* Sanity checks on configuration directory (mostly done)
|
||||||
|
@ -10,7 +11,7 @@ Goals for 1.0 release:
|
||||||
* Reenable queues for delayed packets (done)
|
* Reenable queues for delayed packets (done)
|
||||||
* Merge documentation files (SECURITY, INSTALL, PROTOCOL) into tinc.texi
|
* Merge documentation files (SECURITY, INSTALL, PROTOCOL) into tinc.texi
|
||||||
* Different authentication scheme (done)
|
* Different authentication scheme (done)
|
||||||
|
* Add randomness to packet headers and PING/PONG requests
|
||||||
|
|
||||||
Goals for future releases:
|
Goals for future releases:
|
||||||
|
|
||||||
|
|
10
src/net.c
10
src/net.c
|
@ -17,7 +17,7 @@
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
$Id: net.c,v 1.35.4.103 2001/03/13 21:32:24 guus Exp $
|
$Id: net.c,v 1.35.4.104 2001/05/04 18:45:02 guus Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
@ -848,12 +848,18 @@ sigalrm_handler(int a)
|
||||||
cp
|
cp
|
||||||
cfg = get_config_val(upstreamcfg, config_connectto);
|
cfg = get_config_val(upstreamcfg, config_connectto);
|
||||||
|
|
||||||
if(!cfg && upstreamcfg == config)
|
if(!cfg)
|
||||||
|
if(upstreamcfg == config)
|
||||||
{
|
{
|
||||||
/* No upstream IP given, we're listen only. */
|
/* No upstream IP given, we're listen only. */
|
||||||
signal(SIGALRM, SIG_IGN);
|
signal(SIGALRM, SIG_IGN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* We previously tried all the ConnectTo lines. Now wrap back to the first. */
|
||||||
|
cfg = get_config_val(config, config_connectto);
|
||||||
|
}
|
||||||
|
|
||||||
while(cfg)
|
while(cfg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue