From c5fccc0c65a441700dc92add4880127331a37f33 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Wed, 18 Jan 2017 09:56:00 +0100 Subject: [PATCH] BFD: reformat code to match vpp code style Change-Id: I40deb8b40f5d3a96d2c0dcb400f489cd05a64348 Signed-off-by: Klement Sekera --- src/vnet/bfd/bfd_udp.c | 344 ++++++++++++++++++++++++++----------------------- 1 file changed, 186 insertions(+), 158 deletions(-) diff --git a/src/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c index fe348404472..1b3c20b852d 100644 --- a/src/vnet/bfd/bfd_udp.c +++ b/src/vnet/bfd/bfd_udp.c @@ -31,8 +31,9 @@ static vlib_node_registration_t bfd_udp6_input_node; bfd_udp_main_t bfd_udp_main; -void bfd_add_udp4_transport (vlib_main_t *vm, vlib_buffer_t *b, - bfd_udp_session_t *bus) +void +bfd_add_udp4_transport (vlib_main_t * vm, vlib_buffer_t * b, + bfd_udp_session_t * bus) { udp_header_t *udp; const bfd_udp_key_t *key = &bus->key; @@ -44,7 +45,7 @@ void bfd_add_udp4_transport (vlib_main_t *vm, vlib_buffer_t *b, const size_t headers_size = sizeof (*ip4) + sizeof (*udp); vlib_buffer_advance (b, -headers_size); ip4 = vlib_buffer_get_current (b); - udp = (udp_header_t *)(ip4 + 1); + udp = (udp_header_t *) (ip4 + 1); memset (ip4, 0, headers_size); ip4->ip_version_and_header_length = 0x45; ip4->ttl = 255; @@ -52,7 +53,7 @@ void bfd_add_udp4_transport (vlib_main_t *vm, vlib_buffer_t *b, ip4->src_address.as_u32 = key->local_addr.ip4.as_u32; ip4->dst_address.as_u32 = key->peer_addr.ip4.as_u32; - udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */ + udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */ udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_bfd4); /* fix ip length, checksum and udp length */ @@ -65,8 +66,9 @@ void bfd_add_udp4_transport (vlib_main_t *vm, vlib_buffer_t *b, udp->length = clib_host_to_net_u16 (udp_length); } -void bfd_add_udp6_transport (vlib_main_t *vm, vlib_buffer_t *b, - bfd_udp_session_t *bus) +void +bfd_add_udp6_transport (vlib_main_t * vm, vlib_buffer_t * b, + bfd_udp_session_t * bus) { udp_header_t *udp; const bfd_udp_key_t *key = &bus->key; @@ -78,22 +80,23 @@ void bfd_add_udp6_transport (vlib_main_t *vm, vlib_buffer_t *b, const size_t headers_size = sizeof (*ip6) + sizeof (*udp); vlib_buffer_advance (b, -headers_size); ip6 = vlib_buffer_get_current (b); - udp = (udp_header_t *)(ip6 + 1); + udp = (udp_header_t *) (ip6 + 1); memset (ip6, 0, headers_size); ip6->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (0x6 << 28); + clib_host_to_net_u32 (0x6 << 28); ip6->hop_limit = 255; ip6->protocol = IP_PROTOCOL_UDP; clib_memcpy (&ip6->src_address, &key->local_addr.ip6, - sizeof (ip6->src_address)); + sizeof (ip6->src_address)); clib_memcpy (&ip6->dst_address, &key->peer_addr.ip6, - sizeof (ip6->dst_address)); + sizeof (ip6->dst_address)); - udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */ + udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */ udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_bfd6); /* fix ip payload length and udp length */ - const u16 udp_length = vlib_buffer_length_in_chain (vm, b) - (sizeof (*ip6)); + const u16 udp_length = + vlib_buffer_length_in_chain (vm, b) - (sizeof (*ip6)); udp->length = clib_host_to_net_u16 (udp_length); ip6->payload_length = udp->length; @@ -107,8 +110,8 @@ void bfd_add_udp6_transport (vlib_main_t *vm, vlib_buffer_t *b, } } -static bfd_session_t *bfd_lookup_session (bfd_udp_main_t *bum, - const bfd_udp_key_t *key) +static bfd_session_t * +bfd_lookup_session (bfd_udp_main_t * bum, const bfd_udp_key_t * key) { uword *p = mhash_get (&bum->bfd_session_idx_by_bfd_key, key); if (p) @@ -119,13 +122,15 @@ static bfd_session_t *bfd_lookup_session (bfd_udp_main_t *bum, } static vnet_api_error_t -bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index, - u32 desired_min_tx_us, u32 required_min_rx_us, - u8 detect_mult, const ip46_address_t *local_addr, - const ip46_address_t *peer_addr, u32 *bs_index) +bfd_udp_add_session_internal (bfd_udp_main_t * bum, u32 sw_if_index, + u32 desired_min_tx_us, u32 required_min_rx_us, + u8 detect_mult, + const ip46_address_t * local_addr, + const ip46_address_t * peer_addr, + u32 * bs_index) { vnet_sw_interface_t *sw_if = - vnet_get_sw_interface (vnet_get_main (), sw_if_index); + vnet_get_sw_interface (vnet_get_main (), sw_if_index); /* get a pool entry and if we end up not needing it, give it back */ bfd_transport_t t = BFD_TRANSPORT_UDP4; if (!ip46_address_is_ip4 (local_addr)) @@ -151,29 +156,30 @@ bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index, key->sw_if_index = sw_if->sw_if_index; mhash_set (&bum->bfd_session_idx_by_bfd_key, key, bs->bs_idx, NULL); BFD_DBG ("session created, bs_idx=%u, sw_if_index=%d, local=%U, peer=%U", - bs->bs_idx, key->sw_if_index, format_ip46_address, &key->local_addr, - IP46_TYPE_ANY, format_ip46_address, &key->peer_addr, IP46_TYPE_ANY); + bs->bs_idx, key->sw_if_index, format_ip46_address, + &key->local_addr, IP46_TYPE_ANY, format_ip46_address, + &key->peer_addr, IP46_TYPE_ANY); if (BFD_TRANSPORT_UDP4 == t) { bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4, - &key->peer_addr, key->sw_if_index); + &key->peer_addr, + key->sw_if_index); BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) " - "returns %d", - format_ip46_address, &key->peer_addr, IP46_TYPE_ANY, - key->sw_if_index, bus->adj_index); + "returns %d", format_ip46_address, &key->peer_addr, + IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); } else { bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6, - &key->peer_addr, key->sw_if_index); + &key->peer_addr, + key->sw_if_index); BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) " - "returns %d", - format_ip46_address, &key->peer_addr, IP46_TYPE_ANY, - key->sw_if_index, bus->adj_index); + "returns %d", format_ip46_address, &key->peer_addr, + IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); } bs->config_desired_min_tx_us = desired_min_tx_us; bs->required_min_rx_us = required_min_rx_us; - bs->required_min_echo_rx_us = required_min_rx_us; /* FIXME */ + bs->required_min_echo_rx_us = required_min_rx_us; /* FIXME */ bs->local_detect_mult = detect_mult; bfd_session_start (bum->bfd_main, bs); *bs_index = bs->bs_idx; @@ -181,11 +187,12 @@ bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index, } static vnet_api_error_t -bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr, - const ip46_address_t *peer_addr) +bfd_udp_validate_api_input (u32 sw_if_index, + const ip46_address_t * local_addr, + const ip46_address_t * peer_addr) { vnet_sw_interface_t *sw_if = - vnet_get_sw_interface (vnet_get_main (), sw_if_index); + vnet_get_sw_interface (vnet_get_main (), sw_if_index); u8 local_ip_valid = 0; ip_interface_address_t *ia = NULL; if (!sw_if) @@ -196,10 +203,10 @@ bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr, if (ip46_address_is_ip4 (local_addr)) { if (!ip46_address_is_ip4 (peer_addr)) - { - BFD_ERR ("IP family mismatch"); - return VNET_API_ERROR_INVALID_ARGUMENT; - } + { + BFD_ERR ("IP family mismatch"); + return VNET_API_ERROR_INVALID_ARGUMENT; + } ip4_main_t *im = &ip4_main; /* *INDENT-OFF* */ @@ -219,10 +226,10 @@ bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr, else { if (ip46_address_is_ip4 (peer_addr)) - { - BFD_ERR ("IP family mismatch"); - return VNET_API_ERROR_INVALID_ARGUMENT; - } + { + BFD_ERR ("IP family mismatch"); + return VNET_API_ERROR_INVALID_ARGUMENT; + } ip6_main_t *im = &ip6_main; /* *INDENT-OFF* */ foreach_ip_interface_address ( @@ -249,14 +256,14 @@ bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr, return 0; } -vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us, - u32 required_min_rx_us, u8 detect_mult, - const ip46_address_t *local_addr, - const ip46_address_t *peer_addr, - u32 *bs_index) +vnet_api_error_t +bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us, + u32 required_min_rx_us, u8 detect_mult, + const ip46_address_t * local_addr, + const ip46_address_t * peer_addr, u32 * bs_index) { vnet_api_error_t rv = - bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr); + bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr); if (rv) { return rv; @@ -271,24 +278,26 @@ vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us, BFD_ERR ("desired_min_tx_us < 1"); return VNET_API_ERROR_INVALID_ARGUMENT; } - return bfd_udp_add_session_internal ( - &bfd_udp_main, sw_if_index, desired_min_tx_us, required_min_rx_us, - detect_mult, local_addr, peer_addr, bs_index); + return bfd_udp_add_session_internal (&bfd_udp_main, sw_if_index, + desired_min_tx_us, required_min_rx_us, + detect_mult, local_addr, peer_addr, + bs_index); } -vnet_api_error_t bfd_udp_del_session (u32 sw_if_index, - const ip46_address_t *local_addr, - const ip46_address_t *peer_addr) +vnet_api_error_t +bfd_udp_del_session (u32 sw_if_index, + const ip46_address_t * local_addr, + const ip46_address_t * peer_addr) { vnet_api_error_t rv = - bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr); + bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr); if (rv) { return rv; } bfd_udp_main_t *bum = &bfd_udp_main; vnet_sw_interface_t *sw_if = - vnet_get_sw_interface (vnet_get_main (), sw_if_index); + vnet_get_sw_interface (vnet_get_main (), sw_if_index); bfd_udp_key_t key; memset (&key, 0, sizeof (key)); key.sw_if_index = sw_if->sw_if_index; @@ -312,7 +321,8 @@ vnet_api_error_t bfd_udp_del_session (u32 sw_if_index, return 0; } -typedef enum { +typedef enum +{ BFD_UDP_INPUT_NEXT_NORMAL, BFD_UDP_INPUT_NEXT_REPLY, BFD_UDP_INPUT_N_NEXT, @@ -334,15 +344,17 @@ static char *bfd_udp_error_strings[] = { #undef F }; -typedef enum { +typedef enum +{ #define F(sym, str) BFD_UDP_ERROR_##sym, foreach_bfd_udp_error (F) #undef F - BFD_UDP_N_ERROR, + BFD_UDP_N_ERROR, } bfd_udp_error_t; -static void bfd_udp4_find_headers (vlib_buffer_t *b, const ip4_header_t **ip4, - const udp_header_t **udp) +static void +bfd_udp4_find_headers (vlib_buffer_t * b, const ip4_header_t ** ip4, + const udp_header_t ** udp) { /* sanity check first */ const i32 start = vnet_buffer (b)->ip.start_of_ip_header; @@ -353,49 +365,49 @@ static void bfd_udp4_find_headers (vlib_buffer_t *b, const ip4_header_t **ip4, *udp = NULL; return; } - *ip4 = (ip4_header_t *)(b->data + start); - if ((u8 *)*ip4 > (u8 *)vlib_buffer_get_current (b)) + *ip4 = (ip4_header_t *) (b->data + start); + if ((u8 *) * ip4 > (u8 *) vlib_buffer_get_current (b)) { BFD_ERR ("Start of ip header is beyond current data, ignoring"); *ip4 = NULL; *udp = NULL; return; } - *udp = (udp_header_t *)((*ip4) + 1); + *udp = (udp_header_t *) ((*ip4) + 1); } -static bfd_udp_error_t bfd_udp4_verify_transport (const ip4_header_t *ip4, - const udp_header_t *udp, - const bfd_session_t *bs) +static bfd_udp_error_t +bfd_udp4_verify_transport (const ip4_header_t * ip4, + const udp_header_t * udp, const bfd_session_t * bs) { const bfd_udp_session_t *bus = &bs->udp; const bfd_udp_key_t *key = &bus->key; if (ip4->src_address.as_u32 != key->peer_addr.ip4.as_u32) { BFD_ERR ("IPv4 src addr mismatch, got %U, expected %U", - format_ip4_address, ip4->src_address.as_u8, format_ip4_address, - key->peer_addr.ip4.as_u8); + format_ip4_address, ip4->src_address.as_u8, format_ip4_address, + key->peer_addr.ip4.as_u8); return BFD_UDP_ERROR_BAD; } if (ip4->dst_address.as_u32 != key->local_addr.ip4.as_u32) { BFD_ERR ("IPv4 dst addr mismatch, got %U, expected %U", - format_ip4_address, ip4->dst_address.as_u8, format_ip4_address, - key->local_addr.ip4.as_u8); + format_ip4_address, ip4->dst_address.as_u8, format_ip4_address, + key->local_addr.ip4.as_u8); return BFD_UDP_ERROR_BAD; } const u8 expected_ttl = 255; if (ip4->ttl != expected_ttl) { BFD_ERR ("IPv4 unexpected TTL value %u, expected %u", ip4->ttl, - expected_ttl); + expected_ttl); return BFD_UDP_ERROR_BAD; } if (clib_net_to_host_u16 (udp->src_port) < 49152 || clib_net_to_host_u16 (udp->src_port) > 65535) { BFD_ERR ("Invalid UDP src port %u, out of range <49152,65535>", - udp->src_port); + udp->src_port); } return BFD_UDP_ERROR_NONE; } @@ -406,33 +418,35 @@ typedef struct bfd_pkt_t pkt; } bfd_rpc_update_t; -static void bfd_rpc_update_session_cb (const bfd_rpc_update_t *a) +static void +bfd_rpc_update_session_cb (const bfd_rpc_update_t * a) { bfd_consume_pkt (bfd_udp_main.bfd_main, &a->pkt, a->bs_idx); } -static void bfd_rpc_update_session (u32 bs_idx, const bfd_pkt_t *pkt) +static void +bfd_rpc_update_session (u32 bs_idx, const bfd_pkt_t * pkt) { /* packet length was already verified to be correct by the caller */ const u32 data_size = sizeof (bfd_rpc_update_t) - - STRUCT_SIZE_OF (bfd_rpc_update_t, pkt) + - pkt->head.length; + STRUCT_SIZE_OF (bfd_rpc_update_t, pkt) + pkt->head.length; u8 data[data_size]; - bfd_rpc_update_t *update = (bfd_rpc_update_t *)data; + bfd_rpc_update_t *update = (bfd_rpc_update_t *) data; update->bs_idx = bs_idx; clib_memcpy (&update->pkt, pkt, pkt->head.length); vl_api_rpc_call_main_thread (bfd_rpc_update_session_cb, data, data_size); } -static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, - vlib_buffer_t *b, bfd_session_t **bs_out) +static bfd_udp_error_t +bfd_udp4_scan (vlib_main_t * vm, vlib_node_runtime_t * rt, + vlib_buffer_t * b, bfd_session_t ** bs_out) { const bfd_pkt_t *pkt = vlib_buffer_get_current (b); if (sizeof (*pkt) > b->current_length) { - BFD_ERR ( - "Payload size %d too small to hold bfd packet of minimum size %d", - b->current_length, sizeof (*pkt)); + BFD_ERR + ("Payload size %d too small to hold bfd packet of minimum size %d", + b->current_length, sizeof (*pkt)); return BFD_UDP_ERROR_BAD; } const ip4_header_t *ip4; @@ -451,7 +465,7 @@ static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, if (pkt->your_disc) { BFD_DBG ("Looking up BFD session using discriminator %u", - pkt->your_disc); + pkt->your_disc); bs = bfd_find_session_by_disc (bfd_udp_main.bfd_main, pkt->your_disc); } else @@ -462,9 +476,9 @@ static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, key.local_addr.ip4.as_u32 = ip4->dst_address.as_u32; key.peer_addr.ip4.as_u32 = ip4->src_address.as_u32; BFD_DBG ("Looking up BFD session using key (sw_if_index=%u, local=%U, " - "peer=%U)", - key.sw_if_index, format_ip4_address, key.local_addr.ip4.as_u8, - format_ip4_address, key.peer_addr.ip4.as_u8); + "peer=%U)", + key.sw_if_index, format_ip4_address, key.local_addr.ip4.as_u8, + format_ip4_address, key.peer_addr.ip4.as_u8); bs = bfd_lookup_session (&bfd_udp_main, &key); } if (!bs) @@ -487,8 +501,9 @@ static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, return BFD_UDP_ERROR_NONE; } -static void bfd_udp6_find_headers (vlib_buffer_t *b, const ip6_header_t **ip6, - const udp_header_t **udp) +static void +bfd_udp6_find_headers (vlib_buffer_t * b, const ip6_header_t ** ip6, + const udp_header_t ** udp) { /* sanity check first */ const i32 start = vnet_buffer (b)->ip.start_of_ip_header; @@ -499,62 +514,65 @@ static void bfd_udp6_find_headers (vlib_buffer_t *b, const ip6_header_t **ip6, *udp = NULL; return; } - *ip6 = (ip6_header_t *)(b->data + start); - if ((u8 *)*ip6 > (u8 *)vlib_buffer_get_current (b)) + *ip6 = (ip6_header_t *) (b->data + start); + if ((u8 *) * ip6 > (u8 *) vlib_buffer_get_current (b)) { BFD_ERR ("Start of ip header is beyond current data, ignoring"); *ip6 = NULL; *udp = NULL; return; } - *udp = (udp_header_t *)((*ip6) + 1); + *udp = (udp_header_t *) ((*ip6) + 1); } -static bfd_udp_error_t bfd_udp6_verify_transport (const ip6_header_t *ip6, - const udp_header_t *udp, - const bfd_session_t *bs) +static bfd_udp_error_t +bfd_udp6_verify_transport (const ip6_header_t * ip6, + const udp_header_t * udp, const bfd_session_t * bs) { const bfd_udp_session_t *bus = &bs->udp; const bfd_udp_key_t *key = &bus->key; if (ip6->src_address.as_u64[0] != key->peer_addr.ip6.as_u64[0] && ip6->src_address.as_u64[1] != key->peer_addr.ip6.as_u64[1]) { - BFD_ERR ("IP src addr mismatch, got %U, expected %U", format_ip6_address, - ip6, format_ip6_address, &key->peer_addr.ip6); + BFD_ERR ("IP src addr mismatch, got %U, expected %U", + format_ip6_address, ip6, format_ip6_address, + &key->peer_addr.ip6); return BFD_UDP_ERROR_BAD; } if (ip6->dst_address.as_u64[0] != key->local_addr.ip6.as_u64[0] && ip6->dst_address.as_u64[1] != key->local_addr.ip6.as_u64[1]) { - BFD_ERR ("IP dst addr mismatch, got %U, expected %U", format_ip6_address, - ip6, format_ip6_address, &key->local_addr.ip6); + BFD_ERR ("IP dst addr mismatch, got %U, expected %U", + format_ip6_address, ip6, format_ip6_address, + &key->local_addr.ip6); return BFD_UDP_ERROR_BAD; } const u8 expected_hop_limit = 255; if (ip6->hop_limit != expected_hop_limit) { BFD_ERR ("IPv6 unexpected hop-limit value %u, expected %u", - ip6->hop_limit, expected_hop_limit); + ip6->hop_limit, expected_hop_limit); return BFD_UDP_ERROR_BAD; } if (clib_net_to_host_u16 (udp->src_port) < 49152 || clib_net_to_host_u16 (udp->src_port) > 65535) { BFD_ERR ("Invalid UDP src port %u, out of range <49152,65535>", - udp->src_port); + udp->src_port); } return BFD_UDP_ERROR_NONE; } -static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, - vlib_buffer_t *b, bfd_session_t **bs_out) +static bfd_udp_error_t +bfd_udp6_scan (vlib_main_t * vm, vlib_node_runtime_t * rt, + vlib_buffer_t * b, bfd_session_t ** bs_out) { const bfd_pkt_t *pkt = vlib_buffer_get_current (b); if (sizeof (*pkt) > b->current_length) { - BFD_ERR ( - "Payload size %d too small to hold bfd packet of minimum size %d", - b->current_length, sizeof (*pkt)); + BFD_ERR + ("Payload size %d too small to hold bfd packet of minimum size %d", + b->current_length, sizeof (*pkt)); return BFD_UDP_ERROR_BAD; } const ip6_header_t *ip6; @@ -573,7 +591,7 @@ static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, if (pkt->your_disc) { BFD_DBG ("Looking up BFD session using discriminator %u", - pkt->your_disc); + pkt->your_disc); bs = bfd_find_session_by_disc (bfd_udp_main.bfd_main, pkt->your_disc); } else @@ -586,9 +604,9 @@ static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, key.peer_addr.ip6.as_u64[0] = ip6->src_address.as_u64[0]; key.peer_addr.ip6.as_u64[1] = ip6->src_address.as_u64[1]; BFD_DBG ("Looking up BFD session using key (sw_if_index=%u, local=%U, " - "peer=%U)", - key.sw_if_index, format_ip6_address, &key.local_addr, - format_ip6_address, &key.peer_addr); + "peer=%U)", + key.sw_if_index, format_ip6_address, &key.local_addr, + format_ip6_address, &key.peer_addr); bs = bfd_lookup_session (&bfd_udp_main, &key); } if (!bs) @@ -615,14 +633,15 @@ static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_node_runtime_t *rt, * Process a frame of bfd packets * Expect 1 packet / frame */ -static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt, - vlib_frame_t *f, int is_ipv6) +static uword +bfd_udp_input (vlib_main_t * vm, vlib_node_runtime_t * rt, + vlib_frame_t * f, int is_ipv6) { u32 n_left_from, *from; bfd_input_trace_t *t0; - from = vlib_frame_vector_args (f); /* array of buffer indices */ - n_left_from = f->n_vectors; /* number of buffer indices */ + from = vlib_frame_vector_args (f); /* array of buffer indices */ + n_left_from = f->n_vectors; /* number of buffer indices */ while (n_left_from > 0) { @@ -637,49 +656,49 @@ static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt, /* If this pkt is traced, snapshot the data */ if (b0->flags & VLIB_BUFFER_IS_TRACED) - { - int len; - t0 = vlib_add_trace (vm, rt, b0, sizeof (*t0)); - len = (b0->current_length < sizeof (t0->data)) ? b0->current_length - : sizeof (t0->data); - t0->len = len; - clib_memcpy (t0->data, vlib_buffer_get_current (b0), len); - } + { + int len; + t0 = vlib_add_trace (vm, rt, b0, sizeof (*t0)); + len = (b0->current_length < sizeof (t0->data)) ? b0->current_length + : sizeof (t0->data); + t0->len = len; + clib_memcpy (t0->data, vlib_buffer_get_current (b0), len); + } /* scan this bfd pkt. error0 is the counter index to bmp */ if (is_ipv6) - { - error0 = bfd_udp6_scan (vm, rt, b0, &bs); - } + { + error0 = bfd_udp6_scan (vm, rt, b0, &bs); + } else - { - error0 = bfd_udp4_scan (vm, rt, b0, &bs); - } + { + error0 = bfd_udp4_scan (vm, rt, b0, &bs); + } b0->error = rt->errors[error0]; next0 = BFD_UDP_INPUT_NEXT_NORMAL; if (BFD_UDP_ERROR_NONE == error0) - { - /* if everything went fine, check for poll bit, if present, re-use - the buffer and based on (now updated) session parameters, send the - final packet back */ - const bfd_pkt_t *pkt = vlib_buffer_get_current (b0); - if (bfd_pkt_get_poll (pkt)) - { - bfd_send_final (vm, b0, bs); - if (is_ipv6) - { - vlib_node_increment_counter (vm, bfd_udp6_input_node.index, - b0->error, 1); - } - else - { - vlib_node_increment_counter (vm, bfd_udp4_input_node.index, - b0->error, 1); - } - next0 = BFD_UDP_INPUT_NEXT_REPLY; - } - } + { + /* if everything went fine, check for poll bit, if present, re-use + the buffer and based on (now updated) session parameters, send the + final packet back */ + const bfd_pkt_t *pkt = vlib_buffer_get_current (b0); + if (bfd_pkt_get_poll (pkt)) + { + bfd_send_final (vm, b0, bs); + if (is_ipv6) + { + vlib_node_increment_counter (vm, bfd_udp6_input_node.index, + b0->error, 1); + } + else + { + vlib_node_increment_counter (vm, bfd_udp4_input_node.index, + b0->error, 1); + } + next0 = BFD_UDP_INPUT_NEXT_REPLY; + } + } vlib_set_next_frame_buffer (vm, rt, next0, bi0); from += 1; @@ -689,8 +708,8 @@ static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt, return f->n_vectors; } -static uword bfd_udp4_input (vlib_main_t *vm, vlib_node_runtime_t *rt, - vlib_frame_t *f) +static uword +bfd_udp4_input (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) { return bfd_udp_input (vm, rt, f, 0); } @@ -719,8 +738,8 @@ VLIB_REGISTER_NODE (bfd_udp4_input_node, static) = { }; /* *INDENT-ON* */ -static uword bfd_udp6_input (vlib_main_t *vm, vlib_node_runtime_t *rt, - vlib_frame_t *f) +static uword +bfd_udp6_input (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) { return bfd_udp_input (vm, rt, f, 1); } @@ -746,8 +765,8 @@ VLIB_REGISTER_NODE (bfd_udp6_input_node, static) = { }; /* *INDENT-ON* */ -static clib_error_t *bfd_sw_interface_up_down (vnet_main_t *vnm, - u32 sw_if_index, u32 flags) +static clib_error_t * +bfd_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags) { // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index); if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)) @@ -759,8 +778,8 @@ static clib_error_t *bfd_sw_interface_up_down (vnet_main_t *vnm, VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down); -static clib_error_t *bfd_hw_interface_up_down (vnet_main_t *vnm, - u32 hw_if_index, u32 flags) +static clib_error_t * +bfd_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP) { @@ -774,10 +793,11 @@ VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down); /* * setup function */ -static clib_error_t *bfd_udp_init (vlib_main_t *vm) +static clib_error_t * +bfd_udp_init (vlib_main_t * vm) { mhash_init (&bfd_udp_main.bfd_session_idx_by_bfd_key, sizeof (uword), - sizeof (bfd_udp_key_t)); + sizeof (bfd_udp_key_t)); bfd_udp_main.bfd_main = &bfd_main; udp_register_dst_port (vm, UDP_DST_PORT_bfd4, bfd_udp4_input_node.index, 1); udp_register_dst_port (vm, UDP_DST_PORT_bfd6, bfd_udp6_input_node.index, 0); @@ -785,3 +805,11 @@ static clib_error_t *bfd_udp_init (vlib_main_t *vm) } VLIB_INIT_FUNCTION (bfd_udp_init); + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- 2.16.6