diff options
| author | Adriano Marto Reis <adrianomarto@gmail.com> | 2023-10-28 07:39:36 +0200 |
|---|---|---|
| committer | Adriano Marto Reis <adrianomarto@gmail.com> | 2023-10-28 07:46:18 +0200 |
| commit | 5a31132472bede171173e60ab30e72a3e942fe3d (patch) | |
| tree | 9419a52cf4a60fc1ccfc56eb0e0035820c153722 | |
| parent | tests: Ajusting the test to the new OSPF6 behaviour (diff) | |
| download | frr-5a31132472bede171173e60ab30e72a3e942fe3d.tar.xz frr-5a31132472bede171173e60ab30e72a3e942fe3d.zip | |
ospf6: removing double-including of ospf6_neighbor.h
Moving ospf6_if_p2xp_neighcfg to ospf6_interface.h so we don't need to
include ospf6_neighbor.h.
Signed-off-by: Adriano Marto Reis <adrianomarto@gmail.com>
| -rw-r--r-- | ospf6d/ospf6_interface.h | 21 | ||||
| -rw-r--r-- | ospf6d/ospf6_neighbor.h | 19 |
2 files changed, 19 insertions, 21 deletions
diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h index 593659f36..2b42af390 100644 --- a/ospf6d/ospf6_interface.h +++ b/ospf6d/ospf6_interface.h @@ -13,8 +13,6 @@ DECLARE_MTYPE(OSPF6_AUTH_MANUAL_KEY); -#include "ospf6_neighbor.h" - /* Debug option */ extern unsigned char conf_debug_ospf6_interface; #define OSPF6_DEBUG_INTERFACE_ON() (conf_debug_ospf6_interface = 1) @@ -36,6 +34,25 @@ struct ospf6_auth_data { uint32_t rx_drop; /* Pkt drop due to auth fail while reading */ }; +PREDECL_RBTREE_UNIQ(ospf6_if_p2xp_neighcfgs); + +struct ospf6_if_p2xp_neighcfg { + struct ospf6_if_p2xp_neighcfgs_item item; + + struct ospf6_interface *ospf6_if; + struct in6_addr addr; + + bool cfg_cost : 1; + + uint32_t cost; + uint16_t poll_interval; + + /* NULL if down */ + struct ospf6_neighbor *active; + + struct event *t_unicast_hello; +}; + /* Interface structure */ struct ospf6_interface { /* IF info from zebra */ diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h index e8bbeaf07..60a76215b 100644 --- a/ospf6d/ospf6_neighbor.h +++ b/ospf6d/ospf6_neighbor.h @@ -150,25 +150,6 @@ struct ospf6_neighbor { bool lls_present; }; -PREDECL_RBTREE_UNIQ(ospf6_if_p2xp_neighcfgs); - -struct ospf6_if_p2xp_neighcfg { - struct ospf6_if_p2xp_neighcfgs_item item; - - struct ospf6_interface *ospf6_if; - struct in6_addr addr; - - bool cfg_cost : 1; - - uint32_t cost; - uint16_t poll_interval; - - /* NULL if down */ - struct ospf6_neighbor *active; - - struct event *t_unicast_hello; -}; - /* Neighbor state */ #define OSPF6_NEIGHBOR_DOWN 1 #define OSPF6_NEIGHBOR_ATTEMPT 2 |