mirror of
https://github.com/FRRouting/frr.git
synced 2025-04-30 13:37:17 +02:00
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>
This commit is contained in:
parent
108adcddbb
commit
5a31132472
|
@ -13,8 +13,6 @@
|
||||||
|
|
||||||
DECLARE_MTYPE(OSPF6_AUTH_MANUAL_KEY);
|
DECLARE_MTYPE(OSPF6_AUTH_MANUAL_KEY);
|
||||||
|
|
||||||
#include "ospf6_neighbor.h"
|
|
||||||
|
|
||||||
/* Debug option */
|
/* Debug option */
|
||||||
extern unsigned char conf_debug_ospf6_interface;
|
extern unsigned char conf_debug_ospf6_interface;
|
||||||
#define OSPF6_DEBUG_INTERFACE_ON() (conf_debug_ospf6_interface = 1)
|
#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 */
|
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 */
|
/* Interface structure */
|
||||||
struct ospf6_interface {
|
struct ospf6_interface {
|
||||||
/* IF info from zebra */
|
/* IF info from zebra */
|
||||||
|
|
|
@ -150,25 +150,6 @@ struct ospf6_neighbor {
|
||||||
bool lls_present;
|
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 */
|
/* Neighbor state */
|
||||||
#define OSPF6_NEIGHBOR_DOWN 1
|
#define OSPF6_NEIGHBOR_DOWN 1
|
||||||
#define OSPF6_NEIGHBOR_ATTEMPT 2
|
#define OSPF6_NEIGHBOR_ATTEMPT 2
|
||||||
|
|
Loading…
Reference in a new issue