--- gvpe/src/conf.h	2003/03/01 15:53:03	1.1
+++ gvpe/src/conf.h	2003/10/16 20:35:14	1.17
@@ -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,23 +20,28 @@
 #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>
 
+#include "slog.h"
 #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
+#define DEFAULT_MTU		1500	// let's ether-net
+
+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
+};
+
+// 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
@@ -44,28 +50,19 @@
   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)
-        RSA_free (rsa_key);
-
-      free (nodename);
-      free (hostname);
-    }
+  ~conf_node ();
 };
 
 struct configuration {
@@ -73,18 +70,29 @@
   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
+  RSA *rsa_key;     // our private rsa key
+  loglevel llevel;
+  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);