--- gvpe/src/conf.C	2003/03/28 16:14:40	1.6
+++ gvpe/src/conf.C	2004/01/17 01:18:36	1.21
@@ -1,10 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
-                  1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
-                  2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2004 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
@@ -33,7 +29,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <netinet/in.h>
+#include "netcompat.h"
 
 #include <openssl/err.h>
 #include <openssl/pem.h>
@@ -53,26 +49,67 @@
 
 struct configuration conf;
 
-configuration::configuration ()
+u8 best_protocol (u8 protset)
 {
-  init ();
+  if (protset & PROT_IPv4  ) return PROT_IPv4;
+  if (protset & PROT_ICMPv4) return PROT_ICMPv4;
+  if (protset & PROT_UDPv4 ) return PROT_UDPv4;
+  if (protset & PROT_TCPv4 ) return PROT_TCPv4;
+
+  return 0;
 }
 
-configuration::~configuration ()
+const char *strprotocol (u8 protocol)
 {
-  cleanup ();
+  if (protocol & PROT_IPv4  ) return "rawip";
+  if (protocol & PROT_ICMPv4) return "icmp";
+  if (protocol & PROT_UDPv4 ) return "udp";
+  if (protocol & PROT_TCPv4 ) return "tcp";
+
+  return "<unknown>";
+}
+
+void
+conf_node::print ()
+{
+  printf ("%4d  fe:fd:80:00:0%1x:%02x  %c  %-8.8s  %-10.10s  %s%s%d\n",
+          id,
+          id >> 8, id & 0xff,
+          compress ? 'Y' : 'N',
+          connectmode   == C_ONDEMAND ? "ondemand" :
+            connectmode == C_NEVER    ? "never" :
+            connectmode == C_ALWAYS   ? "always" : "",
+          nodename,
+          hostname ? hostname : "",
+          hostname ? ":" : "",
+          hostname ? udp_port : 0
+          );
+}
+
+conf_node::~conf_node ()
+{
+  if (rsa_key)
+    RSA_free (rsa_key);
+
+  free (nodename);
+  free (hostname);
 }
 
 void configuration::init ()
 {
   memset (this, 0, sizeof (*this));
 
+  mtu       = DEFAULT_MTU;
   rekey     = DEFAULT_REKEY;
   keepalive = DEFAULT_KEEPALIVE;
   llevel    = L_INFO;
   ip_proto  = IPPROTO_GRE;
+#if ENABLE_ICMP
+  icmp_type = ICMP_ECHOREPLY;
+#endif
 
   default_node.udp_port    = DEFAULT_UDPPORT;
+  default_node.tcp_port    = DEFAULT_UDPPORT;
   default_node.connectmode = conf_node::C_ALWAYS;
   default_node.compress    = true;
   default_node.protocols   = PROT_UDPv4;
@@ -83,10 +120,13 @@
   if (rsa_key)
     RSA_free (rsa_key);
 
-  free (ifname);
-
   rsa_key = 0;
-  ifname = 0;
+
+  free (ifname);     ifname     = 0;
+#if ENABLE_HTTP_PROXY
+  free (proxy_host); proxy_host = 0;
+  free (proxy_auth); proxy_auth = 0;
+#endif
 }
 
 void
@@ -187,6 +227,12 @@
             }
           else if (!strcmp (var, "ip-proto"))
             ip_proto = atoi (val);
+          else if (!strcmp (var, "icmp-type"))
+            {
+#if ENABLE_ICMP
+              icmp_type = atoi (val);
+#endif
+            }
 
           // per config
           else if (!strcmp (var, "node"))
@@ -255,6 +301,24 @@
             script_node_up = strdup (val);
           else if (!strcmp (var, "node-down"))
             script_node_down = strdup (val);
+          else if (!strcmp (var, "http-proxy-host"))
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_host = strdup (val);
+#endif
+            }
+          else if (!strcmp (var, "http-proxy-port"))
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_port = atoi (val);
+#endif
+            }
+          else if (!strcmp (var, "http-proxy-auth"))
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
+#endif
+            }
 
           /* node-specific, non-defaultable */
           else if (node != &default_node && !strcmp (var, "hostname"))
@@ -266,6 +330,8 @@
           /* node-specific, defaultable */
           else if (!strcmp (var, "udp-port"))
             node->udp_port = atoi (val);
+          else if (!strcmp (var, "tcp-port"))
+            node->tcp_port = atoi (val);
           else if (!strcmp (var, "router-priority"))
             node->routerprio = atoi (val);
           else if (!strcmp (var, "connect"))
@@ -292,6 +358,18 @@
               parse_bool (node->compress, "compress", true, false);
             }
           // all these bool options really really cost a lot of executable size!
+          else if (!strcmp (var, "enable-tcp"))
+            {
+#if ENABLE_TCP
+              u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
+#endif
+            }
+          else if (!strcmp (var, "enable-icmp"))
+            {
+#if ENABLE_ICMP
+              u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
+#endif
+            }
           else if (!strcmp (var, "enable-udp"))
             {
               u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
@@ -303,11 +381,9 @@
 
           // unknown or misplaced
           else
-            {
-              slog (L_WARN,
-                      _("unknown or misplaced variable `%s', at '%s' line %d"),
-                      var, fname, lineno);
-            }
+            slog (L_WARN,
+                    _("unknown or misplaced variable `%s', at '%s' line %d"),
+                    var, fname, lineno);
         }
 
       fclose (f);
@@ -376,7 +452,7 @@
   printf (_("keepalive interval: %d\n"), keepalive);
   printf (_("interface:          %s\n"), ifname);
   printf (_("primary rsa key:    %s\n"), prikeyfile ? prikeyfile : "<default>");
-  printf (_("rsa key size:       %d\n"), rsa_key ? RSA_size (rsa_key) : -1);
+  printf (_("rsa key size:       %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
   printf ("\n");
 
   printf ("%4s  %-17s %s %-8.8s  %-10.10s  %s\n",
@@ -388,20 +464,14 @@
   printf ("\n");
 }
 
-void
-conf_node::print ()
+configuration::configuration ()
 {
-  printf ("%4d  fe:fd:80:00:0%1x:%02x  %c  %-8.8s  %-10.10s  %s%s%d\n",
-          id,
-          id >> 8, id & 0xff,
-          compress ? 'Y' : 'N',
-          connectmode   == C_ONDEMAND ? "ondemand" :
-            connectmode == C_NEVER    ? "never" :
-            connectmode == C_ALWAYS   ? "always" : "",
-          nodename,
-          hostname ? hostname : "",
-          hostname ? ":" : "",
-          hostname ? udp_port : 0
-          );
+  init ();
+}
+
+configuration::~configuration ()
+{
+  cleanup ();
 }
 
+