diff options
| author | Adriano Marto Reis <adrianomarto@gmail.com> | 2023-10-28 15:39:36 +1000 |
|---|---|---|
| committer | Adriano Marto Reis <adrianomarto@gmail.com> | 2023-10-28 15:46:18 +1000 |
| commit | 5a31132472bede171173e60ab30e72a3e942fe3d (patch) | |
| tree | 9419a52cf4a60fc1ccfc56eb0e0035820c153722 /ospf6d/ospf6_interface.h | |
| parent | 108adcddbb7f94f3478c047e80313fded21ce435 (diff) | |
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>
Diffstat (limited to 'ospf6d/ospf6_interface.h')
| -rw-r--r-- | ospf6d/ospf6_interface.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h index 593659f360..2b42af390a 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 */ |