From: Ivo Timmermans <ivo@lychnis.net>
Date: Wed, 6 Dec 2000 13:33:49 +0000 (+0000)
Subject: Re-introduced MyVirtualIP and VpnMask, as dummy options.
X-Git-Tag: import-tinc-1.1~785^2~627
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=e469fca4d78e9d23698fe1e6b29b232198cc499e;p=meshlink

Re-introduced MyVirtualIP and VpnMask, as dummy options.
---

diff --git a/src/conf.c b/src/conf.c
index e0cc11e5..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.33 2000/12/05 08:56:44 zarq Exp $
+    $Id: conf.c,v 1.9.4.34 2000/12/06 13:33:48 zarq Exp $
 */
 
 #include "config.h"
@@ -63,10 +63,13 @@ static internal_config_t hazahaza[] = {
   { "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 },
diff --git a/src/conf.h b/src/conf.h
index 297dc42b..60dee5cd 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.h,v 1.6.4.17 2000/11/29 14:24:40 zarq Exp $
+    $Id: conf.h,v 1.6.4.18 2000/12/06 13:33:49 zarq Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -33,6 +33,7 @@ typedef struct ip_mask_t {
 } ip_mask_t;
 
 typedef enum which_t {
+  config_dummy = 0,
   config_name = 1,
   config_connectto,
   config_pingtimeout,