diff options
Diffstat (limited to 'eigrpd/eigrp_macros.h')
| -rw-r--r-- | eigrpd/eigrp_macros.h | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h index 08c2fc34cc..fdb84673df 100644 --- a/eigrpd/eigrp_macros.h +++ b/eigrpd/eigrp_macros.h @@ -39,16 +39,18 @@ #define UNSET_IF_PARAM(S, P) ((S)->P##__config) = 0 #define EIGRP_IF_PARAM_CONFIGURED(S, P) ((S) && (S)->P##__config) -#define EIGRP_IF_PARAM(O, P) \ - (EIGRP_IF_PARAM_CONFIGURED ((O)->params, P)?\ - (O)->params->P:IF_DEF_PARAMS((O)->ifp)->P) +#define EIGRP_IF_PARAM(O, P) \ + (EIGRP_IF_PARAM_CONFIGURED((O)->params, P) \ + ? (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_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)) //------------------------------------------------------------------------------------------------------------------------------------ @@ -60,25 +62,25 @@ /*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) +#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 */ /* FSM macros*/ -#define EIGRP_FSM_EVENT_SCHEDULE(I,E) \ - thread_add_event (master, eigrp_fsm_event, (I), (E)) +#define EIGRP_FSM_EVENT_SCHEDULE(I, E) \ + thread_add_event(master, eigrp_fsm_event, (I), (E)) #endif /* _ZEBRA_EIGRP_MACROS_H_ */ |