--- gvpe/src/conf.h	2003/03/01 15:53:03	1.1
+++ gvpe/src/conf.h	2003/03/21 23:17:01	1.6
@@ -31,6 +31,7 @@
 
 #include <vector>
 
+#include "slog.h"
 #include "global.h"
 
 #define DEFAULT_REKEY		3600
@@ -46,8 +47,10 @@
   char *hostname; // hostname, if known, or NULL.
   u16 port;       // the port to bind to
 
-  enum { C_ONDEMAND, C_NEVER, C_ALWAYS } connectmode;
+  enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS } connectmode;
   bool compress;
+  bool inherit_tos; // inherit TOS in packets send to this destination
+  u32 can_recv, can_send;
 
   u32 routerprio;
 
@@ -73,13 +76,14 @@
   node_vector nodes;
   conf_node default_node;
   conf_node *thisnode;
-  int mtu;       // the mtu used for outgoing tunnel packets
-  int rekey;     // rekey interval
-  int keepalive; // keepalive probes interval
-  char *ifname;  // the interface name (tap0 ...)
-  bool ifpersist; // should the interface be persistent
+  int mtu;          // the mtu used for outgoing tunnel packets
+  double rekey;     // rekey interval
+  double keepalive; // keepalive probes interval
+  char *ifname;     // the interface name (tap0 ...)
+  bool ifpersist;   // should the interface be persistent
   char *prikeyfile;
-  RSA *rsa_key;  // our private rsa key
+  loglevel llevel;
+  RSA *rsa_key;     // our private rsa key
 
   char *script_if_up;
   char *script_node_up;