X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=1e1c60f6c2af3c14af9e38a52a650d71e66ac013;hp=a9c136e1692302d182ba3a69ea8789a53556b50c;hb=45a28b1e893d4da9d7977945a35ec6a8e4554830;hpb=7e817fcf0fdd25aae58259930006c61048b017cd

diff --git a/src/conf.c b/src/conf.c
index a9c136e1..1e1c60f6 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.2 2000/06/27 15:08:57 guus Exp $
 */
 
-/* Created more dynamic storage for lines read from the config file. --
-	Cris van Pelt */
 
 #include "config.h"
 
@@ -35,6 +37,8 @@
 #include "conf.h"
 #include "netutl.h" /* for strtoip */
 
+#include "system.h"
+
 config_t *config;
 int debug_lvl = 0;
 int timeout = 0; /* seconds before timeout */
@@ -59,6 +63,9 @@ static internal_config_t hazahaza[] = {
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
+  { "VpnMask",      vpnmask,        TYPE_IP },
+  { "Hostnames",    resolve_dns,    TYPE_BOOL },
+  { "IndirectData", indirectdata,   TYPE_BOOL },
   { NULL, 0, 0 }
 };
 
@@ -149,14 +156,14 @@ readconfig(const char *fname, FILE *fp)
 
       if(!hazahaza[i].name)
 	{
-	  fprintf(stderr, "%s: %d: Invalid variable name `%s'.\n",
+	  fprintf(stderr, _("%s: %d: Invalid variable name `%s'.\n"),
 		  fname, lineno, p);
 	  return -1;
 	}
 
       if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
 	{
-	  fprintf(stderr, "%s: %d: No value given for `%s'.\n",
+	  fprintf(stderr, _("%s: %d: No value given for `%s'.\n"),
 		  fname, lineno, hazahaza[i].name);
 	  return -1;
 	}
@@ -164,7 +171,7 @@ readconfig(const char *fname, FILE *fp)
       cfg = add_config_val(&config, hazahaza[i].argtype, q);
       if(cfg == NULL)
 	{
-	  fprintf(stderr, "%s: %d: Invalid value `%s' for variable `%s'.\n",
+	  fprintf(stderr, _("%s: %d: Invalid value `%s' for variable `%s'.\n"),
 		  fname, lineno, q, hazahaza[i].name);
 	  return -1;
 	}
@@ -185,7 +192,7 @@ read_config_file(const char *fname)
 
   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, sys_errlist[errno]);
       return 1;
     }
 
@@ -212,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;
+}