X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=4431ccf6a6efefc3224a01da0e2369a745df5f2e;hp=bea38957c189493be40e86ec75ef164359f4e462;hb=85963f4c857abc2d9a4c5a3245cc11257140b9a6;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7

diff --git a/src/conf.c b/src/conf.c
index bea38957..4431ccf6 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,7 +1,7 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Emphyrio,
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
 
     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
@@ -18,8 +18,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* foute config read code, GPL, emphyrio 1998 */
-/* Mutilated by me -- Ivo */
+/* Created more dynamic storage for lines read from the config file. --
+	Cris van Pelt */
 
 #include "config.h"
 
@@ -49,7 +49,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 +59,7 @@ static internal_config_t hazahaza[] = {
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
+  { "VpnMask",      vpnmask,        TYPE_IP },
   { NULL, 0, 0 }
 };
 
@@ -71,7 +72,7 @@ add_config_val(config_t **cfg, int argtype, char *val)
   config_t *p;
   char *q;
 
-  p = (config_t*)xmalloc(sizeof(config_t));
+  p = (config_t*)xmalloc(sizeof(*p));
   p->data.val = 0;
   
   switch(argtype)
@@ -114,15 +115,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)
@@ -200,4 +213,3 @@ get_config_val(which_t type)
   /* Not found */
   return NULL;
 }
-