ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-13 22:03:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rejigged node structure to include score and advertisment history

Browse Source 
information that can be used to help us prioritise which nodes
get advertised when.
This commit is contained in:
gardners 2011-09-13 03:19:54 +09:30
parent 0cb65c4a87
commit f301929026
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mphlr.h
View File

@ -747,9 +747,15 @@ typedef struct overlay_node_observation {
typedef struct overlay_node {
unsigned char sid[SID_SIZE];
int neighbour_id; /* 0=not a neighbour */
long long last_observation_time_ms;
unsigned int last_first_hand_observation_time_sec;
int most_recent_observation_id;
int best_link_score;
int best_observation;
unsigned int last_first_hand_observation_time_sec;
long long last_observation_time_ms;
/* When did we last advertise this node on each interface, and what score
did we advertise? */
long long most_recent_advertisment[OVERLAY_MAX_INTERFACES];
unsigned char most_recent_advertised_score[OVERLAY_MAX_INTERFACES];
overlay_node_observation observations[OVERLAY_MAX_OBSERVATIONS];
} overlay_node;

21
overlay_route.c
View File

@ -412,7 +412,13 @@ overlay_node *overlay_route_find_node(unsigned char *sid,int createP)
for(i=0;i<OVERLAY_MAX_OBSERVATIONS;i++)
overlay_nodes[bin_number][free_slot].observations[i].observed_score=0;
overlay_nodes[bin_number][free_slot].neighbour_id=0;
overlay_nodes[bin_number][free_slot].most_recent_observation_id=0;
overlay_nodes[bin_number][free_slot].most_recent_observation_id=0;
overlay_nodes[bin_number][free_slot].best_link_score=0;
overlay_nodes[bin_number][free_slot].best_observation=0;
for(i=0;i<OVERLAY_MAX_INTERFACES;i++) {
overlay_nodes[bin_number][free_slot].most_recent_advertisment[i]=0;
overlay_nodes[bin_number][free_slot].most_recent_advertised_score[i]=0;
}
}
bcopy(sid,overlay_nodes[bin_number][free_slot].sid,SID_SIZE);
@ -649,10 +655,12 @@ int overlay_route_saw_selfannounce(int interface,overlay_frame *f,long long now)
return 0;
}
/* XXX Think about scheduling this node's score for readvertising? */
int overlay_route_recalc_node_metrics(overlay_node *n,long long now)
{
int o;
int best_score=0;
int best_observation=-1;
for(o=0;o<OVERLAY_MAX_OBSERVATIONS;o++)
{
@ -662,8 +670,17 @@ int overlay_route_recalc_node_metrics(overlay_node *n,long long now)
discounted_score-=(now-n->observations[o].rx_time)/1000;
if (discounted_score<0) discounted_score=0;
n->observations[o].corrected_score=discounted_score;
if (discounted_score>best_score) {
best_score=discounted_score;
best_observation=o;
}
}
}
/* Remember new reachability information */
n->best_link_score=best_score;
n->best_observation=best_observation;
return 0;
}