X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=0a65e32d16dec30f9266c6f149a2eb33d47bdacb;hp=740f4346b36f0f67202cf851831b42d7dd8e4d65;hb=698191fd2f512f3618e2d60592fcd57cd750b965;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69

diff --git a/src/conf.c b/src/conf.c
index 740f4346..0a65e32d 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,9 +19,10 @@
     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.13 2000/10/14 17:04:12 guus Exp $
+    $Id: conf.c,v 1.9.4.21 2000/11/04 22:57:30 guus Exp $
 */
 
+#include "config.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -41,10 +42,11 @@
 #include "connlist.h"
 #include "system.h"
 
-config_t *config;
+config_t *config = NULL;
 int debug_lvl = 0;
 int timeout = 0; /* seconds before timeout */
 char *confbase = NULL;           /* directory in which all config files are */
+char *netname = NULL;            /* name of the vpn network */
 
 /* Will be set if HUP signal is received. It will be processed when it is safe. */
 int sighup = 0;
@@ -54,26 +56,26 @@ int sighup = 0;
 */
 static internal_config_t hazahaza[] = {
 /* Main configuration file keywords */
-  { "Name",         tincname,       TYPE_NAME },
-  { "ConnectTo",    connectto,      TYPE_NAME },
-  { "PingTimeout",  pingtimeout,    TYPE_INT },
-  { "TapDevice",    tapdevice,      TYPE_NAME },
-  { "PrivateKey",   privatekey,     TYPE_NAME },
-  { "KeyExpire",    keyexpire,      TYPE_INT },
-  { "Hostnames",    resolve_dns,    TYPE_BOOL },
-  { "Interface",    interface,      TYPE_NAME },
-  { "InterfaceIP",  interfaceip,    TYPE_IP },
+  { "Name",         config_name,       TYPE_NAME },
+  { "ConnectTo",    config_connectto,      TYPE_NAME },
+  { "PingTimeout",  config_pingtimeout,    TYPE_INT },
+  { "TapDevice",    config_tapdevice,      TYPE_NAME },
+  { "PrivateKey",   config_privatekey,     TYPE_NAME },
+  { "KeyExpire",    config_keyexpire,      TYPE_INT },
+  { "Hostnames",    config_hostnames,    TYPE_BOOL },
+  { "Interface",    config_interface,      TYPE_NAME },
+  { "InterfaceIP",  config_interfaceip,    TYPE_IP },
 /* Host configuration file keywords */
-  { "Address",      address,        TYPE_NAME },
-  { "Port",         port,           TYPE_INT },
-  { "PublicKey",    publickey,      TYPE_NAME },
-  { "Subnet",       subnet,         TYPE_NAME },
-  { "RestrictHosts", restricthosts, TYPE_BOOL },
-  { "RestrictSubnets", restrictsubnets, TYPE_BOOL },
-  { "RestrictAddress", restrictaddress, TYPE_BOOL },
-  { "RestrictPort", restrictport,   TYPE_BOOL },
-  { "IndirectData", indirectdata,   TYPE_BOOL },
-  { "TCPonly",      tcponly,        TYPE_BOOL },
+  { "Address",      config_address,        TYPE_NAME },
+  { "Port",         config_port,           TYPE_INT },
+  { "PublicKey",    config_publickey,      TYPE_NAME },
+  { "Subnet",       config_subnet,         TYPE_IP },		/* Use IPv4 subnets only for now */
+  { "RestrictHosts", config_restricthosts, TYPE_BOOL },
+  { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
+  { "RestrictAddress", config_restrictaddress, TYPE_BOOL },
+  { "RestrictPort", config_restrictport,   TYPE_BOOL },
+  { "IndirectData", config_indirectdata,   TYPE_BOOL },
+  { "TCPonly",      config_tcponly,        TYPE_BOOL },
   { NULL, 0, 0 }
 };
 
@@ -83,12 +85,12 @@ static internal_config_t hazahaza[] = {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {
-  config_t *p, *r;
+  config_t *p;
   char *q;
 cp
   p = (config_t*)xmalloc(sizeof(*p));
   p->data.val = 0;
-  
+
   switch(argtype)
     {
     case TYPE_INT:
@@ -116,22 +118,17 @@ cp
 
   if(p->data.val)
     {
-      if(*cfg)
-        {
-          r = *cfg;
-          while(r->next)
-            r = r->next;
-          r->next = p;
-        }
-      else
-        *cfg = p;
-      p->next = NULL;
+      p->next = *cfg;
+      *cfg = p;
+cp
       return p;
     }
-
-  free(p);
+  else
+    {
+      free(p);
 cp
-  return NULL;
+      return NULL;
+    }
 }
 
 /*
@@ -215,8 +212,13 @@ int read_server_config()
   char *fname;
   int x;
 cp
-  asprintf(fname, "%s/tinc.conf", confbase);
+  asprintf(&fname, "%s/tinc.conf", confbase);
   x = read_config_file(&config, fname);
+  if(x != 0)
+    {
+      fprintf(stderr, _("Failed to read `%s': %m\n"),
+	      fname);
+    }
   free(fname);
 cp
   return x;  
@@ -228,28 +230,11 @@ cp
 const config_t *get_config_val(config_t *p, which_t type)
 {
 cp
-  for(p = config; p != NULL; p = p->next)
+  for(; p != NULL; p = p->next)
     if(p->which == type)
-      return p;
+      break;
 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(config_t *p, which_t type, int index)
-{
-cp  
-  for(p = config; p != NULL; p = p->next)
-    if(p->which == type)
-      if(--index < 0)
-        return p;
-cp  
-  /* Not found */
-  return NULL;
+  return p;
 }
 
 /*