- Fixed indirectdata=no problem

- Added support for multiple ConnectTo lines in tinc.conf.

diff --git a/src/conf.c b/src/conf.c
index 0eab0efd0534ffc52ec94a54eef2d77f0de72a8d..1e1c60f6c2af3c14af9e38a52a650d71e66ac013 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.1 2000/06/17 20:55:54 zarq Exp $
+    $Id: conf.c,v 1.9.4.2 2000/06/27 15:08:57 guus Exp $
 */
 
 
@@ -219,3 +219,21 @@ get_config_val(which_t type)
   /* Not found */
   return NULL;
 }
+
+/*
+  Support for multiple config lines.
+  Index is used to get a specific value, 0 being the first, 1 the second etc.
+*/
+const config_t *
+get_next_config_val(which_t type, int index)
+{
+  config_t *p;
+  
+  for(p = config; p != NULL; p = p->next)
+    if(p->which == type)
+      if(--index < 0)
+        return p;
+  
+  /* Not found */
+  return NULL;
+}

diff --git a/src/conf.h b/src/conf.h
index 968a12a474fcff94612b10840dceec5ac908337f..36bc9a4f4ac9258b49a9a14665425003e83c221d 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -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: conf.h,v 1.6.4.1 2000/06/17 20:55:54 zarq Exp $
+    $Id: conf.h,v 1.6.4.2 2000/06/27 15:08:57 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -74,5 +74,6 @@ extern int timeout;
 extern config_t *add_config_val(config_t **, int, char *);
 extern int read_config_file(const char *);
 extern const config_t *get_config_val(which_t type);
+extern const config_t *get_next_config_val(which_t type, int);
 
 #endif /* __TINC_CONF_H__ */

diff --git a/src/net.c b/src/net.c
index 6457d4c9c431478b8767c6aa459f3592a910a8c8..cdb593e10cf6239bcbfd9a8c2cbb151e0fff7787 100644 (file)
--- a/src/net.c
+++ b/src/net.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: net.c,v 1.35.4.8 2000/06/26 20:30:20 guus Exp $
+    $Id: net.c,v 1.35.4.9 2000/06/27 15:08:58 guus Exp $
 */
 
 #include "config.h"
@@ -548,7 +548,8 @@ cp
   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
-      syslog(LOG_ERR, _("Could not set up a meta connection!"));
+      syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
+             ncn->hostname);
       free_conn_element(ncn);
       return -1;
     }
@@ -587,7 +588,7 @@ cp
     myself->port = cfg->data.val;
 
   if(cfg = get_config_val(indirectdata))
-    if(cfg->data.val)
+    if(cfg->data.val == stupid_true)
       myself->flags |= EXPORTINDIRECTDATA;
 
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
@@ -614,23 +615,27 @@ RETSIGTYPE
 sigalrm_handler(int a)
 {
   config_t const *cfg;
+  int index = 1;
 cp
   cfg = get_config_val(upstreamip);
 
-  if(!setup_outgoing_connection(cfg->data.ip->ip))
+  while(cfg)
     {
-      signal(SIGALRM, SIG_IGN);
-    }
-  else
-    {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry += 5;
-      if(seconds_till_retry>300)    /* Don't wait more than 5 minutes. */
-        seconds_till_retry = 300;
-      alarm(seconds_till_retry);
-      syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
-            seconds_till_retry);
+      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+        {
+          signal(SIGALRM, SIG_IGN);
+          return;
+        }
+      cfg = get_next_config_val(upstreamip, index++); /* Or else we try the next ConnectTo line */
     }
+
+  signal(SIGALRM, sigalrm_handler);
+  seconds_till_retry += 5;
+  if(seconds_till_retry>300)    /* Don't wait more than 5 minutes. */
+    seconds_till_retry = 300;
+  alarm(seconds_till_retry);
+  syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
+        seconds_till_retry);
 cp
 }
 
@@ -640,6 +645,7 @@ cp
 int setup_network_connections(void)
 {
   config_t const *cfg;
+  int index = 1;
 cp
   if((cfg = get_config_val(pingtimeout)) == NULL)
     timeout = 5;
@@ -656,13 +662,17 @@ cp
     /* No upstream IP given, we're listen only. */
     return 0;
 
-  if(setup_outgoing_connection(cfg->data.ip->ip))
+  while(cfg)
     {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 300;
-      alarm(seconds_till_retry);
-      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
+      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+        return 0;
+      cfg = get_next_config_val(upstreamip, index++); /* Or else we try the next ConnectTo line */
     }
+    
+  signal(SIGALRM, sigalrm_handler);
+  seconds_till_retry = 300;
+  alarm(seconds_till_retry);
+  syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
 cp
   return 0;
 }