--- gvpe/src/vpn.C	2003/04/13 16:53:36	1.13
+++ gvpe/src/vpn.C	2003/10/14 15:48:15	1.15
@@ -32,9 +32,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netinet/ip_icmp.h>
+#include <sys/socket.h>
+
+#include "netcompat.h"
 
 #include "pidfile.h"
 
@@ -86,7 +86,7 @@
 
       fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
 
-#ifdef IP_MTU_DISCOVER
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
@@ -124,7 +124,7 @@
         setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
       }
 
-#ifdef IP_MTU_DISCOVER
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
@@ -168,7 +168,7 @@
       }
 #endif
 
-#ifdef IP_MTU_DISCOVER
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
@@ -273,7 +273,9 @@
 bool
 vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
+#if defined(SOL_IP) && defined(IP_TOS)
   setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+#endif
   sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
 
   return true;
@@ -306,11 +308,13 @@
 bool
 vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
+#if defined(SOL_IP) && defined(IP_TOS)
   setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+#endif
 
   pkt->unshift_hdr (4);
 
-  icmphdr *hdr = (icmphdr *)&((*pkt)[0]);
+  icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
   hdr->type = ::conf.icmp_type;
   hdr->code = 255;
   hdr->checksum = 0;
@@ -325,7 +329,9 @@
 bool
 vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
+#if defined(SOL_IP) && defined(IP_TOS)
   setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+#endif
   sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
 
   return true;
@@ -437,7 +443,7 @@
         {
           pkt->len = len;
 
-          icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]);
+          icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
 
           if (hdr->type == ::conf.icmp_type
               && hdr->code == 255)
@@ -531,13 +537,13 @@
 
       if (src != THISNODE->id)
         {
-          slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
+          slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
           exit (1);
         }
 
       if (dst == THISNODE->id)
         {
-          slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
+          slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
           exit (1);
         }