--- gvpe/src/conf.C	2003/04/07 01:12:56	1.12
+++ 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>
@@ -55,18 +51,20 @@
 
 u8 best_protocol (u8 protset)
 {
-  if (protset & PROT_IPv4 ) return PROT_IPv4;
-  if (protset & PROT_UDPv4) return PROT_UDPv4;
-  if (protset & PROT_TCPv4) return PROT_TCPv4;
+  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;
 }
 
 const char *strprotocol (u8 protocol)
 {
-  if (protocol & PROT_IPv4 ) return "rawip";
-  if (protocol & PROT_UDPv4) return "udp";
-  if (protocol & PROT_TCPv4) return "tcp";
+  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>";
 }
@@ -101,10 +99,14 @@
 {
   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;
@@ -225,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"))
@@ -293,14 +301,24 @@
             script_node_up = strdup (val);
           else if (!strcmp (var, "node-down"))
             script_node_down = strdup (val);
-#if ENABLE_HTTP_PROXY
           else if (!strcmp (var, "http-proxy-host"))
-            proxy_host = strdup (val);
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_host = strdup (val);
+#endif
+            }
           else if (!strcmp (var, "http-proxy-port"))
-            proxy_port = atoi (val);
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_port = atoi (val);
+#endif
+            }
           else if (!strcmp (var, "http-proxy-auth"))
-            proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
+            {
+#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"))
@@ -346,6 +364,12 @@
               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;
@@ -428,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",