--- gvpe/src/conf.h	2003/03/06 18:43:07	1.2
+++ gvpe/src/conf.h	2003/04/02 03:25:17	1.11
@@ -19,15 +19,7 @@
 #ifndef VPE_CONF_H__
 #define VPE_CONF_H__
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#ifdef HAVE_OPENSSL_RSA_H
-# include <openssl/rsa.h>
-#else
-# include <rsa.h>
-#endif
+#include <openssl/rsa.h>
 
 #include <vector>
 
@@ -35,8 +27,18 @@
 #include "global.h"
 
 #define DEFAULT_REKEY		3600
-#define DEFAULT_KEEPALIVE	60	// one keepalive/minute (it's just 48 bytes...)
-#define DEFAULT_PORT		655	// same as tinc, conflicts would be rara
+#define DEFAULT_KEEPALIVE	60	// one keepalive/minute (it's just 8 bytes...)
+#define DEFAULT_UDPPORT		655	// same as tinc, conflicts would be rare
+
+enum {
+  PROT_UDPv4 = 1, // udp over ipv4
+  PROT_IPv4  = 2, // generic ip protocol
+  PROT_TCPv4 = 4, // tcp over ipv4 (NYI)
+};
+
+// select the "best" protocol of the available ones
+u8 best_protocol (u8 protset);
+const char *strprotocol (u8 protocol);
 
 struct conf_node {
   int id;         // the id of this node, a 12-bit-number
@@ -45,20 +47,18 @@
   char *nodename; // nodename, an internal nickname.
 
   char *hostname; // hostname, if known, or NULL.
-  u16 port;       // the port to bind to
 
-  enum { C_ONDEMAND, C_NEVER, C_ALWAYS } connectmode;
+  u8 protocols;   // protocols this host can send & receive
+  u16 udp_port, tcp_port;   // the port to bind to
+
+  enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS, C_DISABLED } connectmode;
   bool compress;
+  bool inherit_tos; // inherit TOS in packets send to this destination
 
   u32 routerprio;
 
   void print ();
 
-  conf_node()
-  {
-    memset (this, 0, sizeof *this);
-  }
-
   ~conf_node ()
     {
       if (rsa_key)
@@ -74,14 +74,15 @@
   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
+  u8 ip_proto;    // the ip protocol to use
 
   char *script_if_up;
   char *script_node_up;