j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Re-introduced MyVirtualIP and VpnMask, as dummy options.

Browse source
This commit is contained in:
Ivo Timmermans 2000-12-06 13:33:49 +00:00
parent e50e4a54d6
commit e469fca4d7
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/conf.c
View file

@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -63,10 +63,13 @@ static internal_config_t hazahaza[] = {
{ "Interface", config_interface, TYPE_NAME }, { "Interface", config_interface, TYPE_NAME },
{ "InterfaceIP", config_interfaceip, TYPE_IP }, { "InterfaceIP", config_interfaceip, TYPE_IP },
{ "KeyExpire", config_keyexpire, TYPE_INT }, { "KeyExpire", config_keyexpire, TYPE_INT },
{ "MyVirtualIP", config_dummy, TYPE_IP },
{ "MyOwnVPNIP", config_dummy, TYPE_IP },
{ "Name", config_name, TYPE_NAME }, { "Name", config_name, TYPE_NAME },
{ "PingTimeout", config_pingtimeout, TYPE_INT }, { "PingTimeout", config_pingtimeout, TYPE_INT },
{ "PrivateKey", config_privatekey, TYPE_NAME }, { "PrivateKey", config_privatekey, TYPE_NAME },
{ "TapDevice", config_tapdevice, TYPE_NAME }, { "TapDevice", config_tapdevice, TYPE_NAME },
{ "VpnMask", config_dummy, TYPE_IP },
/* Host configuration file keywords */ /* Host configuration file keywords */
{ "Address", config_address, TYPE_NAME }, { "Address", config_address, TYPE_NAME },
{ "IndirectData", config_indirectdata, TYPE_BOOL }, { "IndirectData", config_indirectdata, TYPE_BOOL },

3
src/conf.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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__ #ifndef __TINC_CONF_H__
@ -33,6 +33,7 @@ typedef struct ip_mask_t {
} ip_mask_t; } ip_mask_t;
typedef enum which_t { typedef enum which_t {
config_dummy = 0,
config_name = 1, config_name = 1,
config_connectto, config_connectto,
config_pingtimeout, config_pingtimeout,