X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=7780a0b23200a0f2732c7b9f228293aaf86c8384;hp=640ec1357d69bd89e171560bf8c317fe188a137a;hb=7398002ade1397bd857953f009f4aed65ffc9218;hpb=6e39481d8f2406e60b5e329ace08b5a005d5cc43

diff --git a/src/conf.c b/src/conf.c
index 640ec135..7780a0b2 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,18 +19,18 @@
     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.11 2000/10/11 13:42:52 guus Exp $
+    $Id: conf.c,v 1.9.4.19 2000/10/29 00:24:31 guus Exp $
 */
 
 
-#include "config.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
+#include <stdio.h>
 
 #include <xalloc.h>
 
@@ -38,12 +38,15 @@
 #include "netutl.h" /* for strtoip */
 #include <utils.h> /* for cp */
 
+#include "config.h"
+#include "connlist.h"
 #include "system.h"
 
-config_t *config;
+config_t *config = NULL;
 int debug_lvl = 0;
 int timeout = 0; /* seconds before timeout */
-char *configfilename = NULL;
+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;
@@ -66,7 +69,7 @@ static internal_config_t hazahaza[] = {
   { "Address",      address,        TYPE_NAME },
   { "Port",         port,           TYPE_INT },
   { "PublicKey",    publickey,      TYPE_NAME },
-  { "Subnet",       subnet,         TYPE_NAME },
+  { "Subnet",       subnet,         TYPE_IP },		/* Use IPv4 subnets only for now */
   { "RestrictHosts", restricthosts, TYPE_BOOL },
   { "RestrictSubnets", restrictsubnets, TYPE_BOOL },
   { "RestrictAddress", restrictaddress, TYPE_BOOL },
@@ -82,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:
@@ -115,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;
+    }
 }
 
 /*
@@ -139,11 +137,11 @@ cp
 */
 int read_config_file(config_t **base, const char *fname)
 {
-  int err;
+  int err = -1;
   FILE *fp;
   char line[MAXBUFSIZE];	/* There really should not be any line longer than this... */
   char *p, *q;
-  int i, err = -1, lineno = 0;
+  int i, lineno = 0;
   config_t *cfg;
 cp
   if((fp = fopen (fname, "r")) == NULL)
@@ -209,34 +207,34 @@ cp
   return err;
 }
 
-/*
-  Look up the value of the config option type
-*/
-const config_t *get_config_val(config_t *p, which_t type)
+int read_server_config()
 {
+  char *fname;
+  int x;
 cp
-  for(p = config; p != NULL; p = p->next)
-    if(p->which == type)
-      return p;
+  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
-  /* Not found */
-  return NULL;
+  return x;  
 }
 
 /*
-  Support for multiple config lines.
-  Index is used to get a specific value, 0 being the first, 1 the second etc.
+  Look up the value of the config option type
 */
-const config_t *get_next_config_val(config_t *p, which_t type, int index)
+const config_t *get_config_val(config_t *p, which_t type)
 {
-cp  
-  for(p = config; p != NULL; p = p->next)
+cp
+  for(; p != NULL; p = p->next)
     if(p->which == type)
-      if(--index < 0)
-        return p;
-cp  
-  /* Not found */
-  return NULL;
+      break;
+cp
+  return p;
 }
 
 /*