kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 07:21:18 +01:00
Code Releases Activity

AODVv2: fix check if route offers improvement

Browse Source
This commit is contained in:
Lotte Steenbrink 2015-04-02 11:23:25 -07:00
parent e9fb853a81
commit 5de25a7bd7
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/net/routing/aodvv2/routingtable.c
View File

@ -194,20 +194,19 @@ static void _reset_entry_if_stale(uint8_t i)
bool routingtable_offers_improvement(struct aodvv2_routing_entry_t *rt_entry,
struct node_data *node_data)
{
/* Check if new info is stale */
if (seqnum_cmp(node_data->seqnum, rt_entry->seqnum) == -1) {
return false;
/* (TODO only guaranteed for AODVV2_DEFAULT_METRIC_TYPE!)*/
bool is_loop_free = node_data->metric <= rt_entry->metric;
int stale = seqnum_cmp(node_data->seqnum, rt_entry->seqnum);
if ((stale == 1) /* New info is more recent and MUST be used */
|| ((stale == 0) && (node_data->metric < rt_entry->metric)) /* New info offers a better route and SHOULD be used */
|| ((stale == 0) && (node_data->metric >= rt_entry->metric) /* Route is not an improvement, */
&& (rt_entry->state == ROUTE_STATE_INVALID) /* but repairs an invalid route */
&& is_loop_free) /* and contains no loops */
) {
return true;
}
/* Check if new info is more costly */
if ((node_data->metric >= rt_entry->metric)
&& !(rt_entry->state != ROUTE_STATE_INVALID)) {
return false;
}
/* Check if new info repairs an invalid route */
if (!(rt_entry->state != ROUTE_STATE_INVALID)) {
return false;
}
return true;
return false;
}
void routingtable_fill_routing_entry_t_rreq(struct aodvv2_packet_data *packet_data,