--- gvpe/src/conf.h	2003/04/02 03:25:17	1.11
+++ gvpe/src/conf.h	2003/10/14 03:22:09	1.15
@@ -31,9 +31,10 @@
 #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
@@ -59,14 +60,7 @@
 
   void print ();
 
-  ~conf_node ()
-    {
-      if (rsa_key)
-        RSA_free (rsa_key);
-
-      free (nodename);
-      free (hostname);
-    }
+  ~conf_node ();
 };
 
 struct configuration {
@@ -82,12 +76,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);