From 5de25a7bd77e842ec6027233739afef169c98ba4 Mon Sep 17 00:00:00 2001
From: Lotte Steenbrink <lotte.steenbrink@fu-berlin.de>
Date: Thu, 2 Apr 2015 11:23:25 -0700
Subject: [PATCH] AODVv2: fix check if route offers improvement
---
sys/net/routing/aodvv2/routingtable.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/sys/net/routing/aodvv2/routingtable.c b/sys/net/routing/aodvv2/routingtable.c
index d392bd1c8d..1c49117459 100644
--- a/sys/net/routing/aodvv2/routingtable.c
+++ b/sys/net/routing/aodvv2/routingtable.c
@@ -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,
--
GitLab