j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't retry if configuration is wrong from the beginning.

Browse source
This commit is contained in:
Guus Sliepen 2003-12-07 14:31:09 +00:00
parent a3cd273751
commit 331cef948d
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/tincd.c
View file

@ -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: tincd.c,v 1.10.4.89 2003/10/06 16:13:08 guus Exp $ $Id: tincd.c,v 1.10.4.90 2003/12/07 14:31:09 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -483,17 +483,10 @@ int main2(int argc, char **argv)
return 1; return 1;
/* Setup sockets and open device. If it doesn't work, don't give up but try again. */ /* Setup sockets and open device. */
while(!setup_network_connections()) { if(!setup_network_connections())
if(do_detach) { goto end;
logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
sleep(maxtimeout);
} else {
logger(LOG_ERR, _("Not restarting."));
return 1;
}
}
/* Start main loop. It only exits when tinc is killed. */ /* Start main loop. It only exits when tinc is killed. */
@ -506,6 +499,7 @@ int main2(int argc, char **argv)
ifdebug(CONNECTIONS) ifdebug(CONNECTIONS)
dump_device_stats(); dump_device_stats();
end:
logger(LOG_NOTICE, _("Terminating")); logger(LOG_NOTICE, _("Terminating"));
#ifndef HAVE_MINGW #ifndef HAVE_MINGW