X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=1b729b2c15d10ff868e3835be56f05825cff073c;hp=ed6037011d117868f5ce9a27bd06a75f893a5718;hb=296171d115614d61480d896cd77898f5393c191d;hpb=9fd02ffcb0cacf3de26e876de5f30510bff137a3

diff --git a/src/conf.c b/src/conf.c
index ed603701..1b729b2c 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,7 +1,9 @@
 /*
     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
@@ -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.
+
+    $Id: conf.c,v 1.9.4.10 2000/09/14 14:34:38 zarq Exp $
 */
 
-/* Created more dynamic storage for lines read from the config file. --
-	Cris van Pelt */
 
 #include "config.h"
 
@@ -34,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;
@@ -52,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 },
@@ -62,6 +69,12 @@ static internal_config_t hazahaza[] = {
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "VpnMask",      vpnmask,        TYPE_IP },
+  { "Hostnames",    resolve_dns,    TYPE_BOOL },
+  { "IndirectData", indirectdata,   TYPE_BOOL },
+  { "TCPonly",      tcponly,        TYPE_BOOL },
+  { "Interface",    interface,      TYPE_NAME },
+  { "InterfaceIP",  interfaceip,    TYPE_IP },
+  { "Name",         tincname,       TYPE_NAME },
   { NULL, 0, 0 }
 };
 
@@ -71,9 +84,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;
   
@@ -100,14 +113,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;
 }
 
@@ -121,7 +145,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));
 	
@@ -176,6 +200,8 @@ readconfig(const char *fname, FILE *fp)
       if(!config)
 	config = cfg;
     }
+cp
+  return 0;
 }
 
 /*
@@ -184,20 +210,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]);
+      fprintf(stderr, _("Could not open %s: %s\n"), fname, strerror(errno));
       return 1;
     }
 
-  if(readconfig(fname, fp))
-    return -1;
-
+  err = readconfig(fname, fp);
   fclose (fp);
-
-  return 0;
+cp
+  return err;
 }
 
 /*
@@ -207,11 +232,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
+}