X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=9bc25a79cecdfc517fbab696f3af33ca2ecedb2e;hp=0eab0efd0534ffc52ec94a54eef2d77f0de72a8d;hb=b1ecbf977722ec473fc8007acd39eb0de581de1a;hpb=33c3a25a66251606cbf20d3bd5b392d8837116e3

diff --git a/src/conf.c b/src/conf.c
index 0eab0efd..9bc25a79 100644
--- 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.6 2000/07/02 13:36:18 guus Exp $
 */
 
 
@@ -36,12 +36,17 @@
 
 #include "conf.h"
 #include "netutl.h" /* for strtoip */
+#include <utils.h> /* for cp */
 
 #include "system.h"
 
 config_t *config;
 int debug_lvl = 0;
 int timeout = 0; /* seconds before timeout */
+char *configfilename = NULL;
+
+/* Will be set if HUP signal is received. It will be processed when it is safe. */
+int sighup = 0;
 
 typedef struct internal_config_t {
   char *name;
@@ -54,7 +59,7 @@ typedef struct internal_config_t {
 */
 static internal_config_t hazahaza[] = {
   { "AllowConnect", allowconnect,   TYPE_BOOL },   /* Is not used anywhere. Remove? */
-  { "ConnectTo",    upstreamip,     TYPE_IP },
+  { "ConnectTo",    upstreamip,     TYPE_NAME },
   { "ConnectPort",  upstreamport,   TYPE_INT },
   { "ListenPort",   listenport,     TYPE_INT },
   { "MyOwnVPNIP",   myvpnip,        TYPE_IP },
@@ -75,9 +80,9 @@ static internal_config_t hazahaza[] = {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {
-  config_t *p;
+  config_t *p, *r;
   char *q;
-
+cp
   p = (config_t*)xmalloc(sizeof(*p));
   p->data.val = 0;
   
@@ -104,14 +109,25 @@ add_config_val(config_t **cfg, int argtype, char *val)
 	p->data.val = 0;
     }
 
+  p->argtype = argtype;
+
   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;
     }
 
   free(p);
+cp
   return NULL;
 }
 
@@ -125,7 +141,7 @@ readconfig(const char *fname, FILE *fp)
   char *p, *q;
   int i, lineno = 0;
   config_t *cfg;
-
+cp
   line = (char *)xmalloc(80 * sizeof(char));
   temp_buf = (char *)xmalloc(80 * sizeof(char));
 	
@@ -180,6 +196,8 @@ readconfig(const char *fname, FILE *fp)
       if(!config)
 	config = cfg;
     }
+cp
+  return 0;
 }
 
 /*
@@ -188,20 +206,19 @@ readconfig(const char *fname, FILE *fp)
 int
 read_config_file(const char *fname)
 {
+  int err;
   FILE *fp;
-
+cp
   if((fp = fopen (fname, "r")) == NULL)
     {
       fprintf(stderr, _("Could not open %s: %s\n"), fname, sys_errlist[errno]);
       return 1;
     }
 
-  if(readconfig(fname, fp))
-    return -1;
-
+  err = readconfig(fname, fp);
   fclose (fp);
-
-  return 0;
+cp
+  return err;
 }
 
 /*
@@ -211,11 +228,49 @@ const config_t *
 get_config_val(which_t type)
 {
   config_t *p;
-
+cp
   for(p = config; p != NULL; p = p->next)
     if(p->which == type)
       return p;
+cp
+  /* 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;
+cp  
+  for(p = config; p != NULL; p = p->next)
+    if(p->which == type)
+      if(--index < 0)
+        return p;
+cp  
   /* Not found */
   return NULL;
 }
+
+/*
+  Remove the complete configuration tree.
+*/
+void clear_config()
+{
+  config_t *p, *next;
+cp
+  for(p = config; p != NULL; p = next)
+    {
+      next = p->next;
+      if(p->data.ptr && (p->argtype == TYPE_NAME))
+        {
+          free(p->data.ptr);
+        }
+      free(p);
+    }
+  config = NULL;
+cp
+}