From 331cef948db4b3cca245ab62cb0fafb5b1e5ebb3 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 7 Dec 2003 14:31:09 +0000 Subject: [PATCH] Don't retry if configuration is wrong from the beginning. --- src/tincd.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/tincd.c b/src/tincd.c index 1a5677f1..dd6b1e74 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software 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" @@ -483,17 +483,10 @@ int main2(int argc, char **argv) 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(do_detach) { - logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); - sleep(maxtimeout); - } else { - logger(LOG_ERR, _("Not restarting.")); - return 1; - } - } + if(!setup_network_connections()) + goto end; /* Start main loop. It only exits when tinc is killed. */ @@ -506,6 +499,7 @@ int main2(int argc, char **argv) ifdebug(CONNECTIONS) dump_device_stats(); +end: logger(LOG_NOTICE, _("Terminating")); #ifndef HAVE_MINGW -- 2.20.1