--- gvpe/src/conf.C	2003/04/08 03:25:35	1.14
+++ gvpe/src/conf.C	2003/10/14 15:48:15	1.17
@@ -33,8 +33,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <netinet/in.h>
-#include <netinet/ip_icmp.h>
+#include "netcompat.h"
 
 #include <openssl/err.h>
 #include <openssl/pem.h>
@@ -108,7 +107,9 @@
   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;
@@ -229,8 +230,11 @@
             }
           else if (!strcmp (var, "ip-proto"))
             ip_proto = atoi (val);
+#if ENABLE_ICMP
+          //TODO: error message
           else if (!strcmp (var, "icmp-type"))
             icmp_type = atoi (val);
+#endif
 
           // per config
           else if (!strcmp (var, "node"))
@@ -440,7 +444,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",