ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Send sequence number on all broadcast frames

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-05-03 16:23:23 +09:30
parent b316de041e
commit f405ba5337
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay_packetformats.c
View File

@ -54,7 +54,7 @@ int overlay_packet_init_header(int encapsulation,
flags |= PACKET_UNICAST;
if (interface)
flags |= PACKET_INTERFACE;
if (seq)
if (seq>=0)
flags |= PACKET_SEQ;
ob_append_byte(buff,flags);

4
overlay_payload.c
View File

@ -127,8 +127,8 @@ int single_packet_encapsulation(struct overlay_buffer *b, struct overlay_frame *
if (frame->source_full)
my_subscriber->send_full=1;
if (overlay_packet_init_header(ENCAP_SINGLE, &context, b, NULL, 0, interface_number, 0))
int seq = interface->sequence_number++;
if (overlay_packet_init_header(ENCAP_SINGLE, &context, b, NULL, 0, interface_number, seq))
return -1;
struct broadcast *broadcast=NULL;

5
overlay_queue.c
View File

@ -239,12 +239,15 @@ overlay_init_packet(struct outgoing_packet *packet, struct subscriber *destinati
packet->i = (interface - overlay_interfaces);
packet->dest=addr;
packet->buffer=ob_new();
int seq=-1;
if (unicast)
packet->unicast_subscriber = destination;
else
seq = interface->sequence_number++;
ob_limitsize(packet->buffer, packet->interface->mtu);
overlay_packet_init_header(ENCAP_OVERLAY, &packet->context, packet->buffer,
destination, unicast, packet->i, 0);
destination, unicast, packet->i, seq);
packet->header_length = ob_position(packet->buffer);
}

36
route_link.c
View File

@ -60,8 +60,9 @@ struct neighbour_link{
// very simple time based link up/down detection;
// when will we consider the link broken?
time_ms_t neighbour_unicast_receive_timeout;
time_ms_t neighbour_broadcast_receive_timeout;
time_ms_t link_timeout;
char unicast;
int sequence;
};
struct neighbour{
@ -422,8 +423,7 @@ static void clean_neighbours(time_ms_t now)
struct neighbour_link **list = &n->links;
while(*list){
struct neighbour_link *link = *list;
if (link->interface->state!=INTERFACE_STATE_UP ||
(link->neighbour_unicast_receive_timeout < now && link->neighbour_broadcast_receive_timeout < now)){
if (link->interface->state!=INTERFACE_STATE_UP || link->link_timeout < now){
if (config.debug.linkstate && config.debug.verbose)
DEBUGF("LINK STATE; link expired from neighbour %s on interface %s",
alloca_tohex_sid(n->subscriber->sid),
@ -472,9 +472,9 @@ static int link_send_neighbours(struct overlay_buffer *payload)
}
char flags=0;
if (best_link->neighbour_unicast_receive_timeout >= now)
if (best_link->unicast)
flags|=FLAG_UNICAST;
if (best_link->neighbour_broadcast_receive_timeout >= now)
else
flags|=FLAG_BROADCAST;
if (n->next_neighbour_update - INCLUDE_ANYWAY <= now){
@ -528,21 +528,24 @@ static void update_alarm(time_ms_t limit){
if (link_send_alarm.alarm>limit || link_send_alarm.alarm==0){
unschedule(&link_send_alarm);
link_send_alarm.alarm = limit;
link_send_alarm.deadline = limit;
schedule(&link_send_alarm);
}
}
struct neighbour_link * get_neighbour_link(struct neighbour *neighbour, struct overlay_interface *interface, int sender_interface)
struct neighbour_link * get_neighbour_link(struct neighbour *neighbour, struct overlay_interface *interface, int sender_interface, char unicast)
{
struct neighbour_link *link = neighbour->links;
while(link){
if (link->interface == interface && link->neighbour_interface == sender_interface)
if (link->interface == interface && link->neighbour_interface == sender_interface && link->unicast == unicast)
return link;
link=link->_next;
}
link = emalloc_zero(sizeof(struct neighbour_link));
link->interface = interface;
link->neighbour_interface = sender_interface;
link->unicast = unicast;
link->sequence = -1;
link->_next = neighbour->links;
if (config.debug.linkstate && config.debug.verbose)
DEBUGF("LINK STATE; new possible link from neighbour %s on interface %s/%d",
@ -561,26 +564,23 @@ int link_received_packet(struct subscriber *subscriber, struct overlay_interface
return 0;
struct neighbour *neighbour = get_neighbour(subscriber, 1);
struct neighbour_link *link=get_neighbour_link(neighbour, interface, sender_interface);
struct neighbour_link *link=get_neighbour_link(neighbour, interface, sender_interface, unicast);
time_ms_t now = gettime_ms();
// for now we'll use a simple time based link up/down flag
// force an update when we start hearing a new neighbour link
if (unicast){
if (link->neighbour_unicast_receive_timeout < now){
if (link->link_timeout < now){
neighbour->next_neighbour_update = now;
neighbour->version++;
update_alarm(now);
}
link->neighbour_unicast_receive_timeout = now + LINK_EXPIRY;
}else{
if (link->neighbour_broadcast_receive_timeout < now){
neighbour->next_neighbour_update = now;
neighbour->version++;
update_alarm(now);
if (sender_seq >=0){
if (link->sequence !=-1 && sender_seq != ((link->sequence+1)&0xFF)){
DEBUGF("LINK STATE; Sequence jumped from %d to %d", link->sequence, sender_seq);
}
link->neighbour_broadcast_receive_timeout = now + (interface->tick_ms * 3);
link->sequence = sender_seq;
}
link->link_timeout = now + (interface->tick_ms *4);
return 0;
}