diff options
author | 2016-08-09 08:55:49 -0400 | |
---|---|---|
committer | 2016-08-09 21:19:28 +0000 | |
commit | 861bd216eba5fe053dbd50dd240c1293ee69a48f (patch) | |
tree | 097fefe19976d0881067d2a82de78f366afae07c /vnet/vnet/cdp/cdp_node.h | |
parent | d5d5ffa427956fab49b28cd1088e373f97145a66 (diff) |
VPP-245 Coding standards cleanup for vnet/vnet/cdp
Change-Id: I5253c52eace4b635f7791aa019ab01ec55d7fb4d
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vnet/vnet/cdp/cdp_node.h')
-rw-r--r-- | vnet/vnet/cdp/cdp_node.h | 114 |
1 files changed, 64 insertions, 50 deletions
diff --git a/vnet/vnet/cdp/cdp_node.h b/vnet/vnet/cdp/cdp_node.h index 712ff14222f..7028ddcaf9c 100644 --- a/vnet/vnet/cdp/cdp_node.h +++ b/vnet/vnet/cdp/cdp_node.h @@ -27,42 +27,44 @@ #include <vnet/cdp/cdp_protocol.h> -typedef enum { - CDP_PACKET_TEMPLATE_ETHERNET, - CDP_PACKET_TEMPLATE_HDLC, - CDP_PACKET_TEMPLATE_SRP, - CDP_N_PACKET_TEMPLATES, +typedef enum +{ + CDP_PACKET_TEMPLATE_ETHERNET, + CDP_PACKET_TEMPLATE_HDLC, + CDP_PACKET_TEMPLATE_SRP, + CDP_N_PACKET_TEMPLATES, } cdp_packet_template_id_t; -typedef struct { - /* neighbor's vlib software interface index */ - u32 sw_if_index; +typedef struct +{ + /* neighbor's vlib software interface index */ + u32 sw_if_index; - /* Timers */ - f64 last_heard; - f64 last_sent; + /* Timers */ + f64 last_heard; + f64 last_sent; - /* Neighbor time-to-live (usually 180s) */ - u8 ttl_in_seconds; + /* Neighbor time-to-live (usually 180s) */ + u8 ttl_in_seconds; - /* "no cdp run" or similar */ - u8 disabled; + /* "no cdp run" or similar */ + u8 disabled; - /* tx packet template id for this neighbor */ - u8 packet_template_index; + /* tx packet template id for this neighbor */ + u8 packet_template_index; - /* Jenkins hash optimization: avoid tlv scan, send short keepalive msg */ - u8 last_packet_signature_valid; - uword last_packet_signature; + /* Jenkins hash optimization: avoid tlv scan, send short keepalive msg */ + u8 last_packet_signature_valid; + uword last_packet_signature; - /* Info we actually keep about each neighbor */ - u8 *device_name; - u8 *version; - u8 *port_id; - u8 *platform; + /* Info we actually keep about each neighbor */ + u8 *device_name; + u8 *version; + u8 *port_id; + u8 *platform; - /* last received packet, for the J-hash optimization */ - u8 *last_rx_pkt; + /* last received packet, for the J-hash optimization */ + u8 *last_rx_pkt; } cdp_neighbor_t; #define foreach_neighbor_string_field \ @@ -71,25 +73,26 @@ _(version) \ _(port_id) \ _(platform) -typedef struct { - /* pool of cdp neighbors */ - cdp_neighbor_t *neighbors; +typedef struct +{ + /* pool of cdp neighbors */ + cdp_neighbor_t *neighbors; - /* tx pcap debug enable */ - u8 tx_pcap_debug; + /* tx pcap debug enable */ + u8 tx_pcap_debug; - /* rapidly find a neighbor by vlib software interface index */ - uword *neighbor_by_sw_if_index; + /* rapidly find a neighbor by vlib software interface index */ + uword *neighbor_by_sw_if_index; - /* Background process node index */ - u32 cdp_process_node_index; + /* Background process node index */ + u32 cdp_process_node_index; - /* Packet templates for different encap types */ - vlib_packet_template_t packet_templates [CDP_N_PACKET_TEMPLATES]; + /* Packet templates for different encap types */ + vlib_packet_template_t packet_templates[CDP_N_PACKET_TEMPLATES]; - /* convenience variables */ - vlib_main_t *vlib_main; - vnet_main_t *vnet_main; + /* convenience variables */ + vlib_main_t *vlib_main; + vnet_main_t *vnet_main; } cdp_main_t; cdp_main_t cdp_main; @@ -103,22 +106,25 @@ _ (PROTOCOL_VERSION, "cdp packets with bad protocol versions") \ _ (CHECKSUM, "cdp packets with bad checksums") \ _ (DISABLED, "cdp packets received on disabled interfaces") -typedef enum { +typedef enum +{ #define _(sym,str) CDP_ERROR_##sym, foreach_cdp_error #undef _ - CDP_N_ERROR, + CDP_N_ERROR, } cdp_error_t; /* cdp packet trace capture */ -typedef struct { - u32 len; - u8 data[400]; +typedef struct +{ + u32 len; + u8 data[400]; } cdp_input_trace_t; -typedef enum { - CDP_EVENT_SEND_NEIGHBOR, - CDP_EVENT_SEND_KEEPALIVE, +typedef enum +{ + CDP_EVENT_SEND_NEIGHBOR, + CDP_EVENT_SEND_KEEPALIVE, } cdp_process_event_t; @@ -126,8 +132,16 @@ cdp_error_t cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0); void cdp_periodic (vlib_main_t * vm); void cdp_keepalive (cdp_main_t * cm, cdp_neighbor_t * n); u16 cdp_checksum (void *p, int count); -u8 * cdp_input_format_trace (u8 * s, va_list * args); +u8 *cdp_input_format_trace (u8 * s, va_list * args); serialize_function_t serialize_cdp_main, unserialize_cdp_main; #endif /* __included_cdp_node_h__ */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ |