--- gvpe/src/conf.h	2003/03/28 16:14:40	1.9
+++ gvpe/src/conf.h	2003/10/16 02:41:21	1.16
@@ -1,5 +1,6 @@
 /*
     conf.h -- configuration database
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,15 +20,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>
 
@@ -39,11 +32,16 @@
 #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)
+  PROT_UDPv4  = 0x01, // udp over ipv4
+  PROT_IPv4   = 0x02, // generic ip protocol
+  PROT_TCPv4  = 0x04, // tcp over ipv4
+  PROT_ICMPv4 = 0x08, // icmp over ipv4
 };
 
+// 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
 
@@ -53,7 +51,7 @@
   char *hostname; // hostname, if known, or NULL.
 
   u8 protocols;   // protocols this host can send & receive
-  u16 udp_port;   // the port to bind to
+  u16 udp_port, tcp_port;   // the port to bind to
 
   enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS, C_DISABLED } connectmode;
   bool compress;
@@ -63,14 +61,7 @@
 
   void print ();
 
-  ~conf_node ()
-    {
-      if (rsa_key)
-        RSA_free (rsa_key);
-
-      free (nodename);
-      free (hostname);
-    }
+  ~conf_node ();
 };
 
 struct configuration {
@@ -86,12 +77,21 @@
   char *prikeyfile;
   RSA *rsa_key;     // our private rsa key
   loglevel llevel;
-  u8 ip_proto;    // the ip protocol to use
+  u8 ip_proto;      // the ip protocol to use
+#if ENABLE_ICMP
+  u8 icmp_type;     // the icmp type for the icmp-protocol
+#endif
 
   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);