… | |
… | |
484 | if (src == 0 || src > conns.size () |
484 | if (src == 0 || src > conns.size () |
485 | || dst > conns.size () |
485 | || dst > conns.size () |
486 | || pkt->typ () >= vpn_packet::PT_MAX) |
486 | || pkt->typ () >= vpn_packet::PT_MAX) |
487 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."), |
487 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."), |
488 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
488 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
489 | else if (dst > conns.size ()) |
|
|
490 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."), |
|
|
491 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
|
|
492 | else |
489 | else |
493 | { |
490 | { |
494 | connection *c = conns[src - 1]; |
491 | connection *c = conns[src - 1]; |
495 | |
492 | |
496 | if (dst == 0) |
493 | if (dst == 0) |
… | |
… | |
559 | if (len > 0) |
556 | if (len > 0) |
560 | { |
557 | { |
561 | pkt->len = len; |
558 | pkt->len = len; |
562 | |
559 | |
563 | // raw sockets deliver the ipv4 header, but don't expect it on sends |
560 | // raw sockets deliver the ipv4 header, but don't expect it on sends |
564 | pkt->skip_hdr (IP_OVERHEAD); |
561 | pkt->skip_hdr (pkt->ipv4_hdr_len ()); |
565 | |
562 | |
566 | recv_vpn_packet (pkt, si); |
563 | recv_vpn_packet (pkt, si); |
567 | } |
564 | } |
568 | else |
565 | else |
569 | { |
566 | { |
… | |
… | |
606 | if (hdr->type == ::conf.icmp_type |
603 | if (hdr->type == ::conf.icmp_type |
607 | && hdr->code == 255) |
604 | && hdr->code == 255) |
608 | { |
605 | { |
609 | // raw sockets deliver the ipv4, but don't expect it on sends |
606 | // raw sockets deliver the ipv4, but don't expect it on sends |
610 | // this is slow, but... |
607 | // this is slow, but... |
611 | pkt->skip_hdr (ICMP_OVERHEAD); |
608 | pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD)); |
612 | |
609 | |
613 | recv_vpn_packet (pkt, si); |
610 | recv_vpn_packet (pkt, si); |
614 | } |
611 | } |
615 | } |
612 | } |
616 | else |
613 | else |