From a8d77eda738855480c3028664028c7a448d52424 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 5 Aug 2016 18:09:54 -0400 Subject: VPP-237 Coding standards cleanup Change-Id: I239143f920285050ad85244ece6893236195534f Signed-off-by: Dave Barach --- vpp/oam/oam.h | 99 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 42 deletions(-) (limited to 'vpp/oam/oam.h') diff --git a/vpp/oam/oam.h b/vpp/oam/oam.h index 79478a05..f6af9788 100644 --- a/vpp/oam/oam.h +++ b/vpp/oam/oam.h @@ -21,61 +21,76 @@ #include /* 36 octets, make a note of it... */ -typedef CLIB_PACKED(struct { - ip4_header_t ip4; - icmp46_header_t icmp; - u16 id; - u16 seq; - u8 data[8]; +/* *INDENT-OFF* */ +typedef CLIB_PACKED (struct { + ip4_header_t ip4; + icmp46_header_t icmp; + u16 id; + u16 seq; + u8 data[8]; }) oam_template_t; +/* *INDENT-ON* */ -typedef CLIB_PACKED(struct { - u64 v8[4]; - u32 v4; +/* *INDENT-OFF* */ +typedef CLIB_PACKED (struct { + u64 v8[4]; + u32 v4; }) oam_template_copy_t; +/* *INDENT-ON* */ -typedef enum { - OAM_STATE_UNKNOWN = 0, - OAM_STATE_ALIVE, - OAM_STATE_DEAD, +typedef enum +{ + OAM_STATE_UNKNOWN = 0, + OAM_STATE_ALIVE, + OAM_STATE_DEAD, } oam_state_t; -typedef struct { - ip4_address_t src_address; - ip4_address_t dst_address; - u32 fib_id; - u32 fib_index; - f64 last_heard_time; - u16 seq; - u16 last_heard_seq; - u16 id; - u8 state; - oam_template_t * template; +typedef struct +{ + ip4_address_t src_address; + ip4_address_t dst_address; + u32 fib_id; + u32 fib_index; + f64 last_heard_time; + u16 seq; + u16 last_heard_seq; + u16 id; + u8 state; + oam_template_t *template; } oam_target_t; -typedef struct { - /* OAM targets */ - oam_target_t * targets; - uword * target_by_address_and_fib_id; +typedef struct +{ + /* OAM targets */ + oam_target_t *targets; + uword *target_by_address_and_fib_id; - /* Config parameters */ - f64 interval; - u32 misses_allowed; + /* Config parameters */ + f64 interval; + u32 misses_allowed; - /* random number seed */ - u32 random_seed; - u16 icmp_id; + /* random number seed */ + u32 random_seed; + u16 icmp_id; - /* oam packet template */ - vlib_packet_template_t packet_template; + /* oam packet template */ + vlib_packet_template_t packet_template; - /* convenience */ - vlib_main_t * vlib_main; - vnet_main_t * vnet_main; + /* convenience */ + vlib_main_t *vlib_main; + vnet_main_t *vnet_main; } oam_main_t; -int vpe_oam_add_del_target (ip4_address_t *src_address, - ip4_address_t *dst_address, - u32 fib_id, int is_add); +int vpe_oam_add_del_target (ip4_address_t * src_address, + ip4_address_t * dst_address, + u32 fib_id, int is_add); #endif /* __included_oam_h__ */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg