diff options
| author | whitespace / reindent <invalid@invalid.invalid> | 2017-07-17 14:03:14 +0200 | 
|---|---|---|
| committer | whitespace / reindent <invalid@invalid.invalid> | 2017-07-17 14:04:07 +0200 | 
| commit | d62a17aedeb0eebdba98238874bb13d62c48dbf9 (patch) | |
| tree | 3b319b1d61c8b85b4d1f06adf8b844bb8a9b5107 /ospf6d/ospf6_spf.h | |
| parent | 888ac268a0077fc9ebd1218cec6ae472af0bfc40 (diff) | |
*: reindentreindent-master-after
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_spf.h')
| -rw-r--r-- | ospf6d/ospf6_spf.h | 169 | 
1 files changed, 79 insertions, 90 deletions
diff --git a/ospf6d/ospf6_spf.h b/ospf6d/ospf6_spf.h index 87a86c0ac8..2246e2dfc7 100644 --- a/ospf6d/ospf6_spf.h +++ b/ospf6d/ospf6_spf.h @@ -28,55 +28,51 @@ extern unsigned char conf_debug_ospf6_spf;  #define OSPF6_DEBUG_SPF_PROCESS   0x01  #define OSPF6_DEBUG_SPF_TIME      0x02  #define OSPF6_DEBUG_SPF_DATABASE  0x04 -#define OSPF6_DEBUG_SPF_ON(level) \ -  (conf_debug_ospf6_spf |= (level)) -#define OSPF6_DEBUG_SPF_OFF(level) \ -  (conf_debug_ospf6_spf &= ~(level)) -#define IS_OSPF6_DEBUG_SPF(level) \ -  (conf_debug_ospf6_spf & OSPF6_DEBUG_SPF_ ## level) +#define OSPF6_DEBUG_SPF_ON(level) (conf_debug_ospf6_spf |= (level)) +#define OSPF6_DEBUG_SPF_OFF(level) (conf_debug_ospf6_spf &= ~(level)) +#define IS_OSPF6_DEBUG_SPF(level)                                              \ +	(conf_debug_ospf6_spf & OSPF6_DEBUG_SPF_##level)  /* Transit Vertex */ -struct ospf6_vertex -{ -  /* type of this vertex */ -  u_int8_t type; +struct ospf6_vertex { +	/* type of this vertex */ +	u_int8_t type; -  /* Vertex Identifier */ -  struct prefix vertex_id; +	/* Vertex Identifier */ +	struct prefix vertex_id; -  /* Identifier String */ -  char name[128]; +	/* Identifier String */ +	char name[128]; -  /* Associated Area */ -  struct ospf6_area *area; +	/* Associated Area */ +	struct ospf6_area *area; -  /* Associated LSA */ -  struct ospf6_lsa *lsa; +	/* Associated LSA */ +	struct ospf6_lsa *lsa; -  /* Distance from Root (i.e. Cost) */ -  u_int32_t cost; +	/* Distance from Root (i.e. Cost) */ +	u_int32_t cost; -  /* Router hops to this node */ -  u_char hops; +	/* Router hops to this node */ +	u_char hops; -  /* capability bits */ -  u_char capability; +	/* capability bits */ +	u_char capability; -  /* Optional capabilities */ -  u_char options[3]; +	/* Optional capabilities */ +	u_char options[3]; -  /* For tree display */ -  struct ospf6_vertex *parent; -  struct list *child_list; +	/* For tree display */ +	struct ospf6_vertex *parent; +	struct list *child_list; -  /* nexthops to this node */ -  struct list *nh_list; +	/* nexthops to this node */ +	struct list *nh_list;  };  #define OSPF6_VERTEX_TYPE_ROUTER  0x01  #define OSPF6_VERTEX_TYPE_NETWORK 0x02 -#define VERTEX_IS_TYPE(t, v) \ -  ((v)->type == OSPF6_VERTEX_TYPE_ ## t ? 1 : 0) +#define VERTEX_IS_TYPE(t, v) ((v)->type == OSPF6_VERTEX_TYPE_##t ? 1 : 0)  /* What triggered the SPF? */  #define OSPF6_SPF_FLAGS_ROUTER_LSA_ADDED         (1 << 0) @@ -88,76 +84,69 @@ struct ospf6_vertex  #define OSPF6_SPF_FLAGS_ROUTER_LSA_ORIGINATED    (1 << 6)  #define OSPF6_SPF_FLAGS_NETWORK_LSA_ORIGINATED   (1 << 7) -static inline void -ospf6_set_spf_reason (struct ospf6* ospf, unsigned int reason) +static inline void ospf6_set_spf_reason(struct ospf6 *ospf, unsigned int reason)  { -  ospf->spf_reason |= reason; +	ospf->spf_reason |= reason;  } -static inline void -ospf6_reset_spf_reason (struct ospf6 *ospf) +static inline void ospf6_reset_spf_reason(struct ospf6 *ospf)  { -  ospf->spf_reason = 0; +	ospf->spf_reason = 0;  } -static inline unsigned int -ospf6_lsadd_to_spf_reason (struct ospf6_lsa *lsa) +static inline unsigned int ospf6_lsadd_to_spf_reason(struct ospf6_lsa *lsa)  { -  unsigned int reason = 0; - -  switch (ntohs (lsa->header->type)) -    { -    case OSPF6_LSTYPE_ROUTER: -      reason = OSPF6_SPF_FLAGS_ROUTER_LSA_ADDED; -      break; -    case OSPF6_LSTYPE_NETWORK: -      reason = OSPF6_SPF_FLAGS_NETWORK_LSA_ADDED; -      break; -    case OSPF6_LSTYPE_LINK: -      reason = OSPF6_SPF_FLAGS_LINK_LSA_ADDED; -      break; -    default: -      break; -    } -  return (reason); +	unsigned int reason = 0; + +	switch (ntohs(lsa->header->type)) { +	case OSPF6_LSTYPE_ROUTER: +		reason = OSPF6_SPF_FLAGS_ROUTER_LSA_ADDED; +		break; +	case OSPF6_LSTYPE_NETWORK: +		reason = OSPF6_SPF_FLAGS_NETWORK_LSA_ADDED; +		break; +	case OSPF6_LSTYPE_LINK: +		reason = OSPF6_SPF_FLAGS_LINK_LSA_ADDED; +		break; +	default: +		break; +	} +	return (reason);  } -static inline unsigned int -ospf6_lsremove_to_spf_reason (struct ospf6_lsa *lsa) +static inline unsigned int ospf6_lsremove_to_spf_reason(struct ospf6_lsa *lsa)  { -  unsigned int reason = 0; - -  switch (ntohs (lsa->header->type)) -    { -    case OSPF6_LSTYPE_ROUTER: -      reason = OSPF6_SPF_FLAGS_ROUTER_LSA_REMOVED; -      break; -    case OSPF6_LSTYPE_NETWORK: -      reason = OSPF6_SPF_FLAGS_NETWORK_LSA_REMOVED; -      break; -    case OSPF6_LSTYPE_LINK: -      reason = OSPF6_SPF_FLAGS_LINK_LSA_REMOVED; -      break; -    default: -      break; -    } -  return (reason); +	unsigned int reason = 0; + +	switch (ntohs(lsa->header->type)) { +	case OSPF6_LSTYPE_ROUTER: +		reason = OSPF6_SPF_FLAGS_ROUTER_LSA_REMOVED; +		break; +	case OSPF6_LSTYPE_NETWORK: +		reason = OSPF6_SPF_FLAGS_NETWORK_LSA_REMOVED; +		break; +	case OSPF6_LSTYPE_LINK: +		reason = OSPF6_SPF_FLAGS_LINK_LSA_REMOVED; +		break; +	default: +		break; +	} +	return (reason);  } -extern void ospf6_spf_table_finish (struct ospf6_route_table *result_table); -extern void ospf6_spf_calculation (u_int32_t router_id, -                                   struct ospf6_route_table *result_table, -                                   struct ospf6_area *oa); -extern void ospf6_spf_schedule (struct ospf6 *ospf, unsigned int reason); +extern void ospf6_spf_table_finish(struct ospf6_route_table *result_table); +extern void ospf6_spf_calculation(u_int32_t router_id, +				  struct ospf6_route_table *result_table, +				  struct ospf6_area *oa); +extern void ospf6_spf_schedule(struct ospf6 *ospf, unsigned int reason); -extern void ospf6_spf_display_subtree (struct vty *vty, const char *prefix, -                                       int rest, struct ospf6_vertex *v); +extern void ospf6_spf_display_subtree(struct vty *vty, const char *prefix, +				      int rest, struct ospf6_vertex *v); -extern void ospf6_spf_config_write (struct vty *vty); -extern int config_write_ospf6_debug_spf (struct vty *vty); -extern void install_element_ospf6_debug_spf (void); -extern void ospf6_spf_init (void); -extern void ospf6_spf_reason_string (unsigned int reason, char *buf, int size); +extern void ospf6_spf_config_write(struct vty *vty); +extern int config_write_ospf6_debug_spf(struct vty *vty); +extern void install_element_ospf6_debug_spf(void); +extern void ospf6_spf_init(void); +extern void ospf6_spf_reason_string(unsigned int reason, char *buf, int size);  #endif /* OSPF6_SPF_H */ -  | 
