Use the unicast tick_ms for link ACK's, if configured

This commit is contained in:
Jeremy Lakeman 2016-01-13 12:01:29 +10:30
parent 953950a8ad
commit e9e35a8f93

View File

@ -900,7 +900,15 @@ static int send_neighbour_link(struct neighbour *n)
n->best_link->ack_counter = ACK_WINDOW; n->best_link->ack_counter = ACK_WINDOW;
n->last_update = now; n->last_update = now;
} }
n->next_neighbour_update = n->last_update + n->best_link->interface->destination->ifconfig.tick_ms; {
struct overlay_interface *i = n->best_link->interface;
int delay = 0;
if (n->best_link->unicast)
delay = i->ifconfig.unicast.tick_ms;
if (delay==0)
delay = i->destination->ifconfig.tick_ms;
n->next_neighbour_update = n->last_update + delay;
}
DEBUGF(ack, "Next update for %s in %"PRId64"ms", alloca_tohex_sid_t(n->subscriber->sid), n->next_neighbour_update - gettime_ms()); DEBUGF(ack, "Next update for %s in %"PRId64"ms", alloca_tohex_sid_t(n->subscriber->sid), n->next_neighbour_update - gettime_ms());
OUT(); OUT();
return 0; return 0;