j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't send ICMP Time Exceeded messages for other Time Exceeded messages.

Browse source 
That would be silly.
This commit is contained in:
Guus Sliepen 2012-02-25 21:46:18 +01:00
parent 5a28aa7b8b
commit f1d5eae643
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/route.c
View file

@ -82,13 +82,14 @@ static bool ratelimit(int frequency) {
static int count = 0; static int count = 0;
if(lasttime == now) { if(lasttime == now) {
if(++count > frequency) if(count >= frequency)
return true; return true;
} else { } else {
lasttime = now; lasttime = now;
count = 0; count = 0;
} }
count++;
return false; return false;
} }
@ -858,7 +859,8 @@ static bool do_decrement_ttl(node_t *source, vpn_packet_t *packet) {
return false; return false;
if(packet->data[22] < 1) { if(packet->data[22] < 1) {
route_ipv4_unreachable(source, packet, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL); if(packet->data[25] != IPPROTO_ICMP || packet->data[46] != ICMP_TIME_EXCEEDED)
route_ipv4_unreachable(source, packet, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL);
return false; return false;
} }
@ -880,7 +882,8 @@ static bool do_decrement_ttl(node_t *source, vpn_packet_t *packet) {
return false; return false;
if(packet->data[21] < 1) { if(packet->data[21] < 1) {
route_ipv6_unreachable(source, packet, ICMP6_TIME_EXCEEDED, ICMP6_TIME_EXCEED_TRANSIT); if(packet->data[20] != IPPROTO_ICMPV6 || packet->data[54] != ICMP6_TIME_EXCEEDED)
route_ipv6_unreachable(source, packet, ICMP6_TIME_EXCEEDED, ICMP6_TIME_EXCEED_TRANSIT);
return false; return false;
} }