- Improved handling of errors on connection attempts.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 6f949f5..f8838d7 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,7 +1,9 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Emphyrio,
-    Copyright (C) 1998,99 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.3 2000/06/27 20:10:47 guus Exp $
 */
 
-/* foute config read code, GPL, emphyrio 1998 */
-/* Mutilated by me -- Ivo */
 
 #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 */
@@ -49,7 +53,7 @@ typedef struct internal_config_t {
   These are all the possible configurable values
 */
 static internal_config_t hazahaza[] = {
-  { "AllowConnect", allowconnect,   TYPE_BOOL },
+  { "AllowConnect", allowconnect,   TYPE_BOOL },   /* Is not used anywhere. Remove? */
   { "ConnectTo",    upstreamip,     TYPE_IP },
   { "ConnectPort",  upstreamport,   TYPE_INT },
   { "ListenPort",   listenport,     TYPE_INT },
@@ -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 }
 };
 
@@ -68,7 +75,7 @@ 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;
 
   p = (config_t*)xmalloc(sizeof(*p));
@@ -99,8 +106,16 @@ add_config_val(config_t **cfg, int argtype, char *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;
     }
 
@@ -114,15 +129,27 @@ add_config_val(config_t **cfg, int argtype, char *val)
 int
 readconfig(const char *fname, FILE *fp)
 {
-  char line[81];
+  char *line, *temp_buf;
   char *p, *q;
   int i, lineno = 0;
   config_t *cfg;
 
+  line = (char *)xmalloc(80 * sizeof(char));
+  temp_buf = (char *)xmalloc(80 * sizeof(char));
+       
   for(;;)
     {
       if(fgets(line, 80, fp) == NULL)
        return 0;
+
+      while(!index(line, '\n'))
+        {
+         fgets(temp_buf, (strlen(line)+1) * 80, fp);
+         if(!temp_buf)
+           break;
+         strcat(line, temp_buf);
+         line = (char *)xrealloc(line, (strlen(line)+1) * sizeof(char));
+        }        
       lineno++;
 
       if((p = strtok(line, "\t\n\r =")) == NULL)
@@ -137,14 +164,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;
        }
@@ -152,7 +179,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;
        }
@@ -173,7 +200,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;
     }
 
@@ -201,3 +228,20 @@ get_config_val(which_t type)
   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;
+}