X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=297dc42b2838d931ac0db742c2964df1421911d1;hp=a1ab1620cd81dc65934c2cb550b3aa787653dc2d;hb=54ef13bf75a7a1e787716ce395ffe847fa74673f;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69

diff --git a/src/conf.h b/src/conf.h
index a1ab1620..297dc42b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,39 +17,41 @@
     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.12 2000/10/14 17:04:13 guus Exp $
+    $Id: conf.h,v 1.6.4.17 2000/11/29 14:24:40 zarq Exp $
 */
 
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
+#include "net.h"
+
 #define MAXTIMEOUT 900  /* Maximum timeout value for retries. Should this be a configuration option? */
 
 typedef struct ip_mask_t {
-  unsigned long ip;
-  unsigned long mask;
+  ipv4_t address;
+  ipv4_t mask;
 } ip_mask_t;
 
 typedef enum which_t {
-  tincname = 1,
-  connectto,
-  pingtimeout,
-  tapdevice,
-  privatekey,
-  keyexpire,
-  resolve_dns,
-  interface,
-  interfaceip,
-  address,
-  port,
-  publickey,
-  subnet,
-  restricthosts,
-  restrictsubnets,
-  restrictaddress,
-  restrictport,
-  indirectdata,
-  tcponly,
+  config_name = 1,
+  config_connectto,
+  config_pingtimeout,
+  config_tapdevice,
+  config_privatekey,
+  config_keyexpire,
+  config_hostnames,
+  config_interface,
+  config_interfaceip,
+  config_address,
+  config_port,
+  config_publickey,
+  config_subnet,
+  config_restricthosts,
+  config_restrictsubnets,
+  config_restrictaddress,
+  config_restrictport,
+  config_indirectdata,
+  config_tcponly,
 } which_t;
 
 typedef struct config_t {
@@ -85,15 +87,15 @@ enum {
 extern config_t *config;
 extern int debug_lvl;
 extern int timeout;
-extern int upstreamindex;
 extern int sighup;
 extern char *confbase;
+extern char *netname;
 
 extern config_t *add_config_val(config_t **, int, char *);
 extern int read_config_file(config_t **, const char *);
 extern const config_t *get_config_val(config_t *, which_t type);
-extern const config_t *get_next_config_val(config_t *, which_t type, int);
 extern void clear_config();
 extern int read_server_config(void);
+extern FILE *ask_and_safe_open(const char*, const char*);
 
 #endif /* __TINC_CONF_H__ */