ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

Comparing gvpe/src/vpn.C (file contents):
Revision 1.58 by root, Tue Feb 15 13:31:23 2011 UTC vs.
Revision 1.59 by root, Fri Sep 16 17:59:46 2011 UTC

559 if (len > 0) 559 if (len > 0)
560 { 560 {
561 pkt->len = len; 561 pkt->len = len;
562 562
563 // raw sockets deliver the ipv4 header, but don't expect it on sends 563 // raw sockets deliver the ipv4 header, but don't expect it on sends
564 pkt->skip_hdr (IP_OVERHEAD); 564 pkt->skip_ipv4_hdr ();
565 565
566 recv_vpn_packet (pkt, si); 566 recv_vpn_packet (pkt, si);
567 } 567 }
568 else 568 else
569 { 569 {
606 if (hdr->type == ::conf.icmp_type 606 if (hdr->type == ::conf.icmp_type
607 && hdr->code == 255) 607 && hdr->code == 255)
608 { 608 {
609 // raw sockets deliver the ipv4, but don't expect it on sends 609 // raw sockets deliver the ipv4, but don't expect it on sends
610 // this is slow, but... 610 // this is slow, but...
611 pkt->skip_hdr (ICMP_OVERHEAD); 611 pkt->skip_ipv4_hdr (ICMP_OVERHEAD - IP_OVERHEAD);
612 612
613 recv_vpn_packet (pkt, si); 613 recv_vpn_packet (pkt, si);
614 } 614 }
615 } 615 }
616 else 616 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines