X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=3edcb30238a1fd54dcbcd9bffd4b037a429f13d9;hp=833b1eb230cfe20c5136c6df9b6e8ecc23a0f114;hb=e1707f7739f450c729e26b921e459d5da07602f9;hpb=52575a573c1d87ee125a54a2e0b4044698904cae

diff --git a/src/conf.c b/src/conf.c
index 833b1eb2..3edcb302 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     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.31 2000/12/01 12:38:42 zarq Exp $
+    $Id: conf.c,v 1.9.4.35 2000/12/22 21:34:20 guus Exp $
 */
 
 #include "config.h"
@@ -58,25 +58,30 @@ int sighup = 0;
 */
 static internal_config_t hazahaza[] = {
 /* Main configuration file keywords */
-  { "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 },
+  { "KeyExpire",    config_keyexpire,      TYPE_INT },
+  { "MyVirtualIP",  config_dummy,          TYPE_IP },
+  { "MyOwnVPNIP",   config_dummy,          TYPE_IP },
+  { "Name",         config_name,       TYPE_NAME },
+  { "PingTimeout",  config_pingtimeout,    TYPE_INT },
+  { "PrivateKey",   config_privatekey,     TYPE_NAME },
+  { "PrivateKeyFile", config_privatekeyfile, TYPE_NAME },
+  { "TapDevice",    config_tapdevice,      TYPE_NAME },
+  { "VpnMask",      config_dummy,          TYPE_IP },
 /* Host configuration file keywords */
   { "Address",      config_address,        TYPE_NAME },
+  { "IndirectData", config_indirectdata,   TYPE_BOOL },
   { "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 },
+  { "PublicKeyFile", config_publickeyfile, TYPE_NAME },
   { "RestrictAddress", config_restrictaddress, TYPE_BOOL },
+  { "RestrictHosts", config_restricthosts, TYPE_BOOL },
   { "RestrictPort", config_restrictport,   TYPE_BOOL },
-  { "IndirectData", config_indirectdata,   TYPE_BOOL },
+  { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
+  { "Subnet",       config_subnet,         TYPE_IP },		/* Use IPv4 subnets only for now */
   { "TCPonly",      config_tcponly,        TYPE_BOOL },
   { NULL, 0, 0 }
 };
@@ -143,7 +148,7 @@ cp
   given, and buf needs to be expanded, the var pointed to by buflen
   will be increased.
 */
-char *readline(FILE *fp, char *buf, size_t *buflen)
+char *readline(FILE *fp, char **buf, size_t *buflen)
 {
   char *newline = NULL;
   char *p;
@@ -162,7 +167,7 @@ char *readline(FILE *fp, char *buf, size_t *buflen)
   if((buf != NULL) && (buflen != NULL))
     {
       size = *buflen;
-      line = buf;
+      line = *buf;
     }
   else
     {
@@ -206,7 +211,10 @@ char *readline(FILE *fp, char *buf, size_t *buflen)
     }
 
   if((buf != NULL) && (buflen != NULL))
-    *buf = size;
+    {
+      *buflen = size;
+      *buf = line;
+    }
   return line;
 }
 
@@ -216,7 +224,7 @@ char *readline(FILE *fp, char *buf, size_t *buflen)
 */
 int read_config_file(config_t **base, const char *fname)
 {
-  int err = -1;
+  int err = -2; /* Parse error */
   FILE *fp;
   char *buffer, *line;
   char *p, *q;
@@ -226,14 +234,18 @@ int read_config_file(config_t **base, const char *fname)
   
 cp
   if((fp = fopen (fname, "r")) == NULL)
-    return -1;
+    {
+      syslog(LOG_ERR, _("Cannot open config file %s: %m"), fname);
+      return -1;
+    }
 
   bufsize = 100;
   buffer = xmalloc(bufsize);
   
   for(;;)
     {
-      if((line = readline(fp, buffer, &bufsize)) == NULL)
+      
+      if((line = readline(fp, &buffer, &bufsize)) == NULL)
 	{
 	  err = -1;
 	  break;
@@ -266,7 +278,7 @@ cp
 
       if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
 	{
-	  fprintf(stderr, _("No value for variable `%s' on line %d while reading config file %s"),
+	  syslog(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
 		  hazahaza[i].name, lineno, fname);
 	  break;
 	}
@@ -274,7 +286,7 @@ cp
       cfg = add_config_val(base, hazahaza[i].argtype, q);
       if(cfg == NULL)
 	{
-	  fprintf(stderr, _("Invalid value for variable `%s' on line %d while reading config file %s"),
+	  syslog(LOG_ERR, _("Invalid value for variable `%s' on line %d while reading config file %s"),
 		  hazahaza[i].name, lineno, fname);
 	  break;
 	}
@@ -297,7 +309,7 @@ int read_server_config()
 cp
   asprintf(&fname, "%s/tinc.conf", confbase);
   x = read_config_file(&config, fname);
-  if(x != 0)
+  if(x == -1) /* System error */
     {
       fprintf(stderr, _("Failed to read `%s': %m\n"),
 	      fname);