X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=0d6d4c2ac3cd97435f32e0cd1cbfa942bdc80694;hp=a3c5f693f8052f7b1712ff0c7bccedf62c8154cb;hb=e469fca4d78e9d23698fe1e6b29b232198cc499e;hpb=ab33c1aa6081f07333bf1de00e4036dd2b4628a6

diff --git a/src/conf.c b/src/conf.c
index a3c5f693..0d6d4c2a 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.30 2000/12/01 12:36:36 zarq Exp $
+    $Id: conf.c,v 1.9.4.34 2000/12/06 13:33:48 zarq Exp $
 */
 
 #include "config.h"
@@ -58,25 +58,28 @@ 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 },
+  { "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 },
   { "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 +146,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 +165,7 @@ char *readline(FILE *fp, char *buf, size_t *buflen)
   if((buf != NULL) && (buflen != NULL))
     {
       size = *buflen;
-      line = buf;
+      line = *buf;
     }
   else
     {
@@ -206,7 +209,10 @@ char *readline(FILE *fp, char *buf, size_t *buflen)
     }
 
   if((buf != NULL) && (buflen != NULL))
-    *buf = size;
+    {
+      *buflen = size;
+      *buf = line;
+    }
   return line;
 }
 
@@ -216,9 +222,9 @@ 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 *line;
+  char *buffer, *line;
   char *p, *q;
   int i, lineno = 0;
   config_t *cfg;
@@ -229,11 +235,12 @@ cp
     return -1;
 
   bufsize = 100;
-  line = xmalloc(bufsize);
+  buffer = xmalloc(bufsize);
   
   for(;;)
     {
-      if((line = readline(fp, line, &bufsize)) == NULL)
+      
+      if((line = readline(fp, &buffer, &bufsize)) == NULL)
 	{
 	  err = -1;
 	  break;
@@ -284,7 +291,7 @@ cp
 	config = cfg;
     }
 
-  free(line);
+  free(buffer);
   fclose (fp);
 cp
   return err;
@@ -297,7 +304,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);