--- gvpe/src/vpn.C	2011/02/15 13:31:23	1.58
+++ gvpe/src/vpn.C	2011/09/16 17:59:46	1.59
@@ -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_ipv4_hdr ();
 
           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_ipv4_hdr (ICMP_OVERHEAD - IP_OVERHEAD);
 
               recv_vpn_packet (pkt, si);
             }