From a97148abd48d3aaff6472430cbfc7de359351409 Mon Sep 17 00:00:00 2001 From: Laurent Deru Date: Thu, 7 Dec 2017 14:56:12 +0100 Subject: [PATCH] Make multicast route lifetime identical to unicast routes --- os/net/rpl-classic/rpl-private.h | 7 ------- os/net/rpl-classic/rpl-timers.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/os/net/rpl-classic/rpl-private.h b/os/net/rpl-classic/rpl-private.h index f00734821..723154cdd 100644 --- a/os/net/rpl-classic/rpl-private.h +++ b/os/net/rpl-classic/rpl-private.h @@ -199,13 +199,6 @@ #define RPL_ROUTE_FROM_MULTICAST_DAO 2 #define RPL_ROUTE_FROM_DIO 3 -/* Multicast Route Lifetime as a multiple of the lifetime unit */ -#ifdef RPL_CONF_MCAST_LIFETIME -#define RPL_MCAST_LIFETIME RPL_CONF_MCAST_LIFETIME -#else -#define RPL_MCAST_LIFETIME 3 -#endif - /* DIS related */ #define RPL_DIS_SEND 1 diff --git a/os/net/rpl-classic/rpl-timers.c b/os/net/rpl-classic/rpl-timers.c index b89a1258d..56eda7abc 100644 --- a/os/net/rpl-classic/rpl-timers.c +++ b/os/net/rpl-classic/rpl-timers.c @@ -283,7 +283,7 @@ handle_dao_timer(void *ptr) if(uip_ds6_if.maddr_list[i].isused && uip_is_addr_mcast_global(&uip_ds6_if.maddr_list[i].ipaddr)) { dao_output_target(instance->current_dag->preferred_parent, - &uip_ds6_if.maddr_list[i].ipaddr, RPL_MCAST_LIFETIME); + &uip_ds6_if.maddr_list[i].ipaddr, instance->default_lifetime); } } @@ -293,7 +293,7 @@ handle_dao_timer(void *ptr) /* Don't send if it's also our own address, done that already */ if(uip_ds6_maddr_lookup(&mcast_route->group) == NULL) { dao_output_target(instance->current_dag->preferred_parent, - &mcast_route->group, RPL_MCAST_LIFETIME); + &mcast_route->group, instance->default_lifetime); } mcast_route = list_item_next(mcast_route); }