--- gvpe/src/vpn.C	2011/02/08 23:13:48	1.57
+++ gvpe/src/vpn.C	2011/09/16 18:01:27	1.60
@@ -1,6 +1,6 @@
 /*
     vpn.C -- handle the protocol, encryption, handshaking etc.
-    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
  
     This file is part of GVPE.
 
@@ -561,7 +561,7 @@
           pkt->len = len;
 
           // raw sockets deliver the ipv4 header, but don't expect it on sends
-          pkt->skip_hdr (IP_OVERHEAD);
+          pkt->skip_hdr (pkt->ipv4_hdr_len ());
 
           recv_vpn_packet (pkt, si);
         }
@@ -608,7 +608,7 @@
             {
               // raw sockets deliver the ipv4, but don't expect it on sends
               // this is slow, but...
-              pkt->skip_hdr (ICMP_OVERHEAD);
+              pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
 
               recv_vpn_packet (pkt, si);
             }