--- gvpe/src/conf.h	2005/03/26 03:16:24	1.29
+++ gvpe/src/conf.h	2008/08/07 16:34:21	1.33
@@ -16,7 +16,7 @@
  
     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
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef GVPE_CONF_H__
@@ -34,13 +34,16 @@
 #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
 #define DEFAULT_DNS_OVERLAP_FACTOR	.5F	// RTT * LATENCY_FACTOR == sending rate
 #define DEFAULT_DNS_MAX_OUTSTANDING	100	// max. number of outstanding requests
 
-enum {
+enum
+{
   PROT_UDPv4  = 0x01, // udp over ipv4
   PROT_IPv4   = 0x02, // generic ip protocol
   PROT_TCPv4  = 0x04, // tcp over ipv4 (server)
@@ -55,7 +58,8 @@
 u8 best_protocol (u8 protset);
 const char *strprotocol (u8 protocol);
 
-struct conf_node {
+struct conf_node
+{
   int id;         // the id of this node, a 12-bit-number
 
   RSA *rsa_key;   // his public key
@@ -71,19 +75,27 @@
   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;
 
+  bool can_direct (struct conf_node *other);
+
   void print ();
 
   ~conf_node ();
 };
 
-struct configuration {
+struct configuration
+{
   typedef vector<conf_node *> node_vector;
   node_vector nodes;
   conf_node default_node;
@@ -123,8 +135,7 @@
 
   void init ();
   void cleanup ();
-  void read_config (bool need_keys);
-  void clear_config ();
+  void clear ();
 
   // create a filename from string, replacing %s by the nodename
   // and using relative paths under confbase.
@@ -136,6 +147,22 @@
   ~configuration ();
 };
 
+struct configuration_parser
+{
+  configuration &conf;
+
+  bool need_keys;
+  conf_node *node;
+
+  int argc;
+  char **argv;
+
+  configuration_parser (configuration &conf, bool need_keys, int argc, char **argv);
+
+  const char *parse_line (char *line);
+  void parse_argv ();
+};
+
 extern struct configuration conf;
 
 #define THISNODE ::conf.thisnode