- Improved handling of errors on connection attempts.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index ed60370..f8838d7 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,7 +1,9 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Emphyrio,
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Emphyrio,

-    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+                            2000 Guus Sliepen <guus@sliepen.warande.net>
+                           2000 Cris van Pelt <tribbel@arise.dhs.org>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -16,10 +18,10 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     You should have received a copy of the GNU General Public License
     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.3 2000/06/27 20:10:47 guus Exp $

 */
 
 */
 

-/* Created more dynamic storage for lines read from the config file. --
-       Cris van Pelt */

 
 #include "config.h"
 
 
 #include "config.h"
 


@@ -62,6 +64,8 @@ static internal_config_t hazahaza[] = {
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "VpnMask",      vpnmask,        TYPE_IP },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "VpnMask",      vpnmask,        TYPE_IP },

+  { "Hostnames",    resolve_dns,    TYPE_BOOL },
+  { "IndirectData", indirectdata,   TYPE_BOOL },

   { NULL, 0, 0 }
 };
 
   { NULL, 0, 0 }
 };
 


@@ -71,7 +75,7 @@ static internal_config_t hazahaza[] = {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {

-  config_t *p;
+  config_t *p, *r;

   char *q;
 
   p = (config_t*)xmalloc(sizeof(*p));
   char *q;
 
   p = (config_t*)xmalloc(sizeof(*p));


@@ -102,8 +106,16 @@ add_config_val(config_t **cfg, int argtype, char *val)
 
   if(p->data.val)
     {
 
   if(p->data.val)
     {

-      p->next = *cfg;
-      *cfg = p;
+      if(*cfg)
+        {
+          r = *cfg;
+          while(r->next)
+            r = r->next;
+          r->next = p;
+        }
+      else
+        *cfg = p;
+      p->next = NULL;

       return p;
     }
 
       return p;
     }
 


@@ -215,3 +227,21 @@ get_config_val(which_t type)
   /* Not found */
   return NULL;
 }
   /* 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;
+}