projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e50e4a5
)
Re-introduced MyVirtualIP and VpnMask, as dummy options.
author
Ivo Timmermans
<ivo@lychnis.net>
Wed, 6 Dec 2000 13:33:49 +0000
(13:33 +0000)
committer
Ivo Timmermans
<ivo@lychnis.net>
Wed, 6 Dec 2000 13:33:49 +0000
(13:33 +0000)
src/conf.c
patch
|
blob
|
history
src/conf.h
patch
|
blob
|
history
diff --git
a/src/conf.c
b/src/conf.c
index
e0cc11e
..
0d6d4c2
100644
(file)
--- 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.
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.3
3 2000/12/05 08:56:44
zarq Exp $
+ $Id: conf.c,v 1.9.4.3
4 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 },
{ "InterfaceIP", config_interfaceip, TYPE_IP },
{ "KeyExpire", config_keyexpire, TYPE_INT },
{ "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 },
{ "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 },
/* 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
297dc42
..
60dee5c
100644
(file)
--- 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.
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.1
7 2000/11/29 14:24:40
zarq Exp $
+ $Id: conf.h,v 1.6.4.1
8 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;
typedef enum which_t {
} ip_mask_t;
typedef enum which_t {
+ config_dummy = 0,
config_name = 1,
config_connectto,
config_pingtimeout,
config_name = 1,
config_connectto,
config_pingtimeout,