--- gvpe/src/conf.h	2005/03/28 20:39:18	1.30
+++ gvpe/src/conf.h	2012/01/17 21:25:50	1.40
@@ -1,22 +1,32 @@
 /*
     conf.h -- configuration database
-    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
  
     This file is part of GVPE.
 
-    GVPE is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    GVPE is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+   
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+    Public License for more details.
+   
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
 #ifndef GVPE_CONF_H__
@@ -34,6 +44,8 @@
 #define DEFAULT_UDPPORT	       		655	// same as tinc, conflicts would be rare
 #define DEFAULT_MTU	       		1500	// let's ether-net
 #define DEFAULT_MAX_RETRY      		3600	// retry at least this often
+#define DEFAULT_MAX_TTL      		60	// packets expire after this many seconds
+#define DEFAULT_MAX_QUEUE      		512	// never queue more than this many packets
  
 #define DEFAULT_DNS_TIMEOUT_FACTOR	8.F	// initial retry timeout multiple
 #define DEFAULT_DNS_SEND_INTERVAL	.01F	// minimum send interval
@@ -47,6 +59,8 @@
   PROT_TCPv4  = 0x04, // tcp over ipv4 (server)
   PROT_ICMPv4 = 0x08, // icmp over ipv4
   PROT_DNSv4  = 0x10, // dns tunnel ipv4 (server)
+  PROT_IPv42  = 0x20, // temporary hack to invetsigate packet loss
+  PROT_ALL    = 0x3f
 };
 
 #define PROT_RELIABLE (PROT_TCPv4 | PROT_DNSv4)
@@ -73,13 +87,33 @@
   u8 protocols;   // protocols this host can send & receive
   u16 udp_port, tcp_port;   // the port to bind to
   int max_retry;
+  double max_ttl;   // packets expire after this many seconds
+  int max_queue;    // maixmum send queue length
 
   enum connectmode { C_ONDEMAND, C_NEVER, C_ALWAYS, C_DISABLED } connectmode;
   bool compress;
   bool inherit_tos; // inherit TOS in packets send to this destination
 
+  vector<const char *> allow_direct;
+  vector<const char *> deny_direct;
+
   u32 routerprio;
 
+  u8 connectable_protocols () const
+  {
+    u8 protocols = this->protocols;
+
+    // mask out endpoints we can't connect to
+    if (!udp_port) protocols &= ~PROT_UDPv4;
+    if (!tcp_port) protocols &= ~PROT_TCPv4;
+    if (!dns_port) protocols &= ~PROT_DNSv4;
+
+    return protocols;
+  }
+
+  bool may_direct (struct conf_node *other);
+  void finalise ();
+
   void print ();
 
   ~conf_node ();
@@ -92,6 +126,7 @@
   conf_node default_node;
   conf_node *thisnode;
   int mtu;          // the mtu used for outgoing tunnel packets
+  int nfmark;       // the SO_MARK // netfilter mark // fwmark
   double rekey;     // rekey interval
   double keepalive; // keepalive probes interval
   char *ifname;     // the interface name (tap0 ...)
@@ -100,12 +135,16 @@
   RSA *rsa_key;     // our private rsa key
   loglevel llevel;
   u8 ip_proto;      // the ip protocol to use
+#if 1//D2
+  u8 ip2_proto;      // the ip protocol to use
+#endif
 #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_change;
   char *script_node_down;
   char *pidfilename;
 
@@ -117,6 +156,7 @@
 
 #if ENABLE_DNS
   char *dns_forw_host;
+  bool dns_case_preserving;
   u16 dns_forw_port;
   float dns_timeout_factor;
   float dns_send_interval;
@@ -130,7 +170,7 @@
 
   // create a filename from string, replacing %s by the nodename
   // and using relative paths under confbase.
-  char *config_filename (const char *name, const char *dflt);
+  char *config_filename (const char *name, const char *dflt = 0);
 
   void print ();
 
@@ -150,6 +190,7 @@
 
   configuration_parser (configuration &conf, bool need_keys, int argc, char **argv);
 
+  void parse_file (const char *fname);
   const char *parse_line (char *line);
   void parse_argv ();
 };