diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-05 12:49:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 12:49:17 -0400 |
| commit | 096398104b4c223d7f6a90cae632a1b418799517 (patch) | |
| tree | 73715073a44921ecdb95ab3f4ecd811f60b62d57 /ospf6d/ospf6_interface.c | |
| parent | 2aaa554de9535e9299519d82b11f55f12c808975 (diff) | |
| parent | 6492ed5369a7bd833e8add952af35a3c9d7f2528 (diff) | |
Merge branch 'master' into pim_5549
Diffstat (limited to 'ospf6d/ospf6_interface.c')
| -rw-r--r-- | ospf6d/ospf6_interface.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 8e0779df92..8cf7f4afaa 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -41,12 +41,14 @@ #include "ospf6_neighbor.h" #include "ospf6_intra.h" #include "ospf6_spf.h" -#include "ospf6_snmp.h" #include "ospf6d.h" #include "ospf6_bfd.h" DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names") DEFINE_QOBJ_TYPE(ospf6_interface) +DEFINE_HOOK(ospf6_interface_change, + (struct ospf6_interface *oi, int state, int old_state), + (oi, state, old_state)) unsigned char conf_debug_ospf6_interface = 0; @@ -518,16 +520,7 @@ ospf6_interface_state_change (u_char next_state, struct ospf6_interface *oi) OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area); } -#ifdef HAVE_SNMP - /* Terminal state or regression */ - if ((next_state == OSPF6_INTERFACE_POINTTOPOINT) || - (next_state == OSPF6_INTERFACE_DROTHER) || - (next_state == OSPF6_INTERFACE_BDR) || - (next_state == OSPF6_INTERFACE_DR) || - (next_state < prev_state)) - ospf6TrapIfStateChange (oi); -#endif - + hook_call(ospf6_interface_change, oi, next_state, prev_state); } |