From b748db674ab6838f31c47f394350ab850ba22748 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 2 Oct 2017 19:50:39 -0400 Subject: eigrpd: Remove ei mapping to connected routes We need one struct eigrp_interface per ifp structure not a ifp->info structure with a ei per connected. Some minor code cleanup as well with macros and their weird usage. Signed-off-by: Donald Sharp --- eigrpd/eigrp_macros.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'eigrpd/eigrp_macros.h') diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h index 7a803fdbf..f1389c73f 100644 --- a/eigrpd/eigrp_macros.h +++ b/eigrpd/eigrp_macros.h @@ -44,38 +44,14 @@ ? (O)->params->P \ : IF_DEF_PARAMS((O)->ifp)->P) -#define EIGRP_IF_PASSIVE_STATUS(O) \ - (EIGRP_IF_PARAM_CONFIGURED((O)->params, passive_interface) \ - ? (O)->params->passive_interface \ - : (EIGRP_IF_PARAM_CONFIGURED(IF_DEF_PARAMS((O)->ifp), \ - passive_interface) \ - ? IF_DEF_PARAMS((O)->ifp)->passive_interface \ - : (O)->eigrp->passive_interface_default)) //------------------------------------------------------------------------------------------------------------------------------------ #define EIGRP_IF_STRING_MAXLEN 40 #define IF_NAME(I) eigrp_if_name_string ((I)) -//------------------------------------------------------------------------------------------------------------------------------------ - -/*Macros for EIGRP interface multicast membership*/ -#define EI_MEMBER_FLAG(M) (1 << (M)) -#define EI_MEMBER_COUNT(O,M) (IF_EIGRP_IF_INFO(ei->ifp)->membership_counts[(M)]) -#define EI_MEMBER_CHECK(O, M) \ - (CHECK_FLAG((O)->multicast_memberships, EI_MEMBER_FLAG(M))) -#define EI_MEMBER_JOINED(O, M) \ - do { \ - SET_FLAG((O)->multicast_memberships, EI_MEMBER_FLAG(M)); \ - IF_EIGRP_IF_INFO((O)->ifp)->membership_counts[(M)]++; \ - } while (0) -#define EI_MEMBER_LEFT(O, M) \ - do { \ - UNSET_FLAG((O)->multicast_memberships, EI_MEMBER_FLAG(M)); \ - IF_EIGRP_IF_INFO((O)->ifp)->membership_counts[(M)]--; \ - } while (0) +//-------------------------------------------------------------------------- -//----------------------------------------------------------------------------------------------------------------------------------- /* Topology Macros */ -- cgit v1.2.3