--- gvpe/src/conf.h	2003/03/21 23:17:01	1.6
+++ gvpe/src/conf.h	2003/04/08 02:00:54	1.13
@@ -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,19 @@
 #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  = 0x01, // udp over ipv4
+  PROT_IPv4   = 0x02, // generic ip protocol
+  PROT_TCPv4  = 0x04, // tcp over ipv4
+  PROT_ICMPv4 = 0x08, // icmp 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,30 +48,19 @@
   char *nodename; // nodename, an internal nickname.
 
   char *hostname; // hostname, if known, or NULL.
-  u16 port;       // the port to bind to
 
-  enum connectmode { 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 can_recv, can_send;
 
   u32 routerprio;
 
   void print ();
 
-  conf_node()
-  {
-    memset (this, 0, sizeof *this);
-  }
-
-  ~conf_node ()
-    {
-      if (rsa_key)
-        RSA_free (rsa_key);
-
-      free (nodename);
-      free (hostname);
-    }
+  ~conf_node ();
 };
 
 struct configuration {
@@ -82,13 +74,21 @@
   char *ifname;     // the interface name (tap0 ...)
   bool ifpersist;   // should the interface be persistent
   char *prikeyfile;
-  loglevel llevel;
   RSA *rsa_key;     // our private rsa key
+  loglevel llevel;
+  u8 ip_proto;      // the ip protocol to use
+  u8 icmp_type;     // the icmp type for the icmp-protocol
 
   char *script_if_up;
   char *script_node_up;
   char *script_node_down;
 
+#if ENABLE_HTTP_PROXY
+  char *proxy_auth;	// login:password
+  char *proxy_host;	// the proxy hostname, e.g. proxy1.example.net
+  u16 proxy_port;	// the proxy port, e.g. 3128
+#endif
+
   void init ();
   void cleanup ();
   void read_config (bool need_keys);