diff options
Diffstat (limited to 'src/plugins/lisp')
23 files changed, 0 insertions, 426 deletions
diff --git a/src/plugins/lisp/lisp-cp/control.c b/src/plugins/lisp/lisp-cp/control.c index 4f5dc55d12c..692048ebd21 100644 --- a/src/plugins/lisp/lisp-cp/control.c +++ b/src/plugins/lisp/lisp-cp/control.c @@ -581,7 +581,6 @@ vnet_lisp_adjacencies_get_by_vni (u32 vni) fwd_entry_t *fwd; lisp_adjacency_t *adjs = 0, adj; - /* *INDENT-OFF* */ pool_foreach (fwd, lcm->fwd_entry_pool) { if (gid_address_vni (&fwd->reid) != vni) @@ -591,7 +590,6 @@ vnet_lisp_adjacencies_get_by_vni (u32 vni) gid_address_copy (&adj.leid, &fwd->leid); vec_add1 (adjs, adj); } - /* *INDENT-ON* */ return adjs; } @@ -804,7 +802,6 @@ vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a, /* Remove remote (if present) from the vectors of lcl-to-rmts * TODO: Address this in a more efficient way. */ - /* *INDENT-OFF* */ pool_foreach (rmts, lcm->lcl_to_rmt_adjacencies) { vec_foreach_index (rmts_itr, rmts[0]) @@ -817,7 +814,6 @@ vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a, } } } - /* *INDENT-ON* */ } /* remove mapping from dictionary */ @@ -1389,12 +1385,10 @@ vnet_lisp_clear_all_remote_adjacencies (void) vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args; vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls; - /* *INDENT-OFF* */ pool_foreach_index (mi, lcm->mapping_pool) { vec_add1 (map_indices, mi); } - /* *INDENT-ON* */ vec_foreach (map_indexp, map_indices) { @@ -2167,7 +2161,6 @@ lisp_cp_enable_l2_l3_ifaces (lisp_cp_main_t * lcm, u8 with_default_route) { u32 vni, dp_table; - /* *INDENT-OFF* */ hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({ dp_add_del_iface(lcm, vni, /* is_l2 */ 0, /* is_add */1, with_default_route); @@ -2176,7 +2169,6 @@ lisp_cp_enable_l2_l3_ifaces (lisp_cp_main_t * lcm, u8 with_default_route) dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1, with_default_route); })); - /* *INDENT-ON* */ } static void @@ -2188,12 +2180,10 @@ lisp_cp_disable_l2_l3_ifaces (lisp_cp_main_t * lcm) hash_free (lcm->fwd_entry_by_mapping_index); pool_free (lcm->fwd_entry_pool); /* Clear state tracking rmt-lcl fwd entries */ - /* *INDENT-OFF* */ pool_foreach (rmts, lcm->lcl_to_rmt_adjacencies) { vec_free(rmts[0]); } - /* *INDENT-ON* */ hash_free (lcm->lcl_to_rmt_adjs_by_lcl_idx); pool_free (lcm->lcl_to_rmt_adjacencies); } @@ -2465,7 +2455,6 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) /* Add ipv4 locators first TODO sort them */ - /* *INDENT-OFF* */ foreach_ip_interface_address (&lcm->im4->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ @@ -2486,7 +2475,6 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) ip_prefix_normalize (ippref); vec_add1 (rlocs, gid[0]); })); - /* *INDENT-ON* */ } return rlocs; @@ -2638,7 +2626,6 @@ add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index, new = loc[0]; if (loc->local) { - /* *INDENT-OFF* */ foreach_ip_interface_address (&lcm->im4->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ @@ -2655,7 +2642,6 @@ add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index, ia); ip_address_set (new_ip, addr, AF_IP6); })); - /* *INDENT-ON* */ if (probed_loc && ip_address_cmp (probed_loc, new_ip) == 0) new.probed = 1; @@ -2669,7 +2655,6 @@ build_map_register_record_list (lisp_cp_main_t * lcm) { mapping_t *recs = 0, rec, *m; - /* *INDENT-OFF* */ pool_foreach (m, lcm->mapping_pool) { /* for now build only local mappings */ @@ -2680,7 +2665,6 @@ build_map_register_record_list (lisp_cp_main_t * lcm) add_locators (lcm, &rec, m->locator_set_index, NULL); vec_add1 (recs, rec); } - /* *INDENT-ON* */ return recs; } @@ -2834,7 +2818,6 @@ lisp_cp_output (vlib_main_t * vm, vlib_node_runtime_t * node, } /* placeholder node used only for statistics */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_output_node) = { .function = lisp_cp_output, .name = "lisp-cp-output", @@ -2851,7 +2834,6 @@ VLIB_REGISTER_NODE (lisp_cp_output_node) = { [LISP_CP_INPUT_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ static int send_rloc_probe (lisp_cp_main_t * lcm, gid_address_t * deid, @@ -2899,7 +2881,6 @@ send_rloc_probes (lisp_cp_main_t * lcm) locator_pair_t *lp; u32 si, rloc_probes_sent = 0; - /* *INDENT-OFF* */ pool_foreach (e, lcm->fwd_entry_pool) { if (vec_len (e->locator_pairs) == 0) @@ -2929,7 +2910,6 @@ send_rloc_probes (lisp_cp_main_t * lcm) rloc_probes_sent++; } } - /* *INDENT-ON* */ vlib_node_increment_counter (vlib_get_main (), lisp_cp_output_node.index, LISP_CP_OUTPUT_ERROR_RLOC_PROBES_SENT, @@ -3038,7 +3018,6 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, /* if there is already a pending request remember it */ - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (!gid_address_cmp (&pmr->src, seid) @@ -3048,7 +3027,6 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, break; } } - /* *INDENT-ON* */ if (!is_resend && duplicate_pmr) { @@ -3597,7 +3575,6 @@ lisp_cp_lookup_nsh (vlib_main_t * vm, return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_LCAF)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = { .function = lisp_cp_lookup_ip4, .name = "lisp-cp-lookup-ip4", @@ -3615,9 +3592,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = { .function = lisp_cp_lookup_ip6, .name = "lisp-cp-lookup-ip6", @@ -3635,9 +3610,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = { .function = lisp_cp_lookup_l2, .name = "lisp-cp-lookup-l2", @@ -3655,9 +3628,7 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_lookup_nsh_node) = { .function = lisp_cp_lookup_nsh, .name = "lisp-cp-lookup-nsh", @@ -3675,7 +3646,6 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_nsh_node) = { [LISP_CP_LOOKUP_NEXT_ARP_NDP_REPLY_TX] = "interface-output", }, }; -/* *INDENT-ON* */ /* lisp_cp_input statistics */ #define foreach_lisp_cp_input_error \ @@ -3890,11 +3860,9 @@ process_map_reply (map_records_arg_t * a) /* remove pending map request entry */ - /* *INDENT-OFF* */ clib_fifo_foreach (noncep, pmr->nonces, ({ hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]); })); - /* *INDENT-ON* */ clib_fifo_free (pmr->nonces); pool_put (lcm->pending_map_requests_pool, pmr); @@ -4063,12 +4031,10 @@ map_record_args_get () map_records_arg_t *rec; /* Cleanup first */ - /* *INDENT-OFF* */ pool_foreach (rec, lcm->map_records_args_pool[vlib_get_thread_index()]) { if (rec->is_free) map_records_arg_free (rec); } - /* *INDENT-ON* */ pool_get (lcm->map_records_args_pool[vlib_get_thread_index ()], rec); return rec; @@ -4448,7 +4414,6 @@ lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_cp_input_node) = { .function = lisp_cp_input, .name = "lisp-cp-input", @@ -4465,7 +4430,6 @@ VLIB_REGISTER_NODE (lisp_cp_input_node) = { [LISP_CP_INPUT_NEXT_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ clib_error_t * lisp_cp_init (vlib_main_t * vm) @@ -4553,13 +4517,11 @@ vnet_lisp_get_stats (void) lisp_stats_key_t *key; u32 index; - /* *INDENT-OFF* */ hash_foreach_mem (key, index, lgm->lisp_stats_index_by_key, { if (lisp_stats_api_fill (lcm, lgm, &stat, key, index)) vec_add1 (stats, stat); }); - /* *INDENT-ON* */ return stats; } @@ -4655,7 +4617,6 @@ remove_dead_pending_map_requests (lisp_cp_main_t * lcm) pending_map_request_t *pmr; u32 *to_be_removed = 0, *pmr_index; - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (pmr->to_be_removed) @@ -4667,7 +4628,6 @@ remove_dead_pending_map_requests (lisp_cp_main_t * lcm) vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool); } } - /* *INDENT-ON* */ vec_foreach (pmr_index, to_be_removed) pool_put_index (lcm->pending_map_requests_pool, pmr_index[0]); @@ -4753,7 +4713,6 @@ update_map_register (lisp_cp_main_t * lcm, f64 dt) if (!lcm->is_enabled || !lcm->map_registering) return; - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_registers_pool) { if (!update_pending_map_register (pmr, dt, &del_all)) @@ -4763,7 +4722,6 @@ update_map_register (lisp_cp_main_t * lcm, f64 dt) vec_add1 (to_be_removed, pmr - lcm->pending_map_registers_pool); } } - /* *INDENT-ON* */ if (del_all) { @@ -4813,13 +4771,11 @@ send_map_resolver_service (vlib_main_t * vm, /* currently no signals are expected - just wait for clock */ (void) vlib_process_get_events (vm, 0); - /* *INDENT-OFF* */ pool_foreach (pmr, lcm->pending_map_requests_pool) { if (!pmr->to_be_removed) update_pending_request (pmr, period); } - /* *INDENT-ON* */ remove_dead_pending_map_requests (lcm); diff --git a/src/plugins/lisp/lisp-cp/gid_dictionary.c b/src/plugins/lisp/lisp-cp/gid_dictionary.c index a0cc9c09e3c..995678ceadc 100644 --- a/src/plugins/lisp/lisp-cp/gid_dictionary.c +++ b/src/plugins/lisp/lisp-cp/gid_dictionary.c @@ -488,13 +488,11 @@ ip4_compute_prefix_lengths_in_search_order (gid_ip4_table_t * db) vec_reset_length (db->ip4_prefix_lengths_in_search_order); /* Note: bitmap reversed so this is in fact a longest prefix match */ - /* *INDENT-OFF* */ clib_bitmap_foreach (i, db->ip4_non_empty_dst_address_length_bitmap) { int dst_address_length = 32 - i; vec_add1 (db->ip4_prefix_lengths_in_search_order, dst_address_length); } - /* *INDENT-ON* */ } @@ -671,13 +669,11 @@ ip6_compute_prefix_lengths_in_search_order (gid_ip6_table_t * db) vec_reset_length (db->ip6_prefix_lengths_in_search_order); /* Note: bitmap reversed so this is in fact a longest prefix match */ - /* *INDENT-OFF* */ clib_bitmap_foreach (i, db->ip6_non_empty_dst_address_length_bitmap) { int dst_address_length = 128 - i; vec_add1 (db->ip6_prefix_lengths_in_search_order, dst_address_length); } - /* *INDENT-ON* */ } static u32 diff --git a/src/plugins/lisp/lisp-cp/lisp_api.c b/src/plugins/lisp/lisp-cp/lisp_api.c index d8f889a24fa..37267635d85 100644 --- a/src/plugins/lisp/lisp-cp/lisp_api.c +++ b/src/plugins/lisp/lisp-cp/lisp_api.c @@ -109,12 +109,10 @@ vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t * vec_free (locator_name); vec_free (a->locators); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_LISP_ADD_DEL_LOCATOR_SET_REPLY, ({ rmp->ls_index = clib_host_to_net_u32 (ls_index); })); - /* *INDENT-ON* */ } static void @@ -287,12 +285,10 @@ static void int rv = 0; vl_api_show_lisp_map_request_mode_reply_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_MAP_REQUEST_MODE_REPLY, ({ rmp->is_src_dst = vnet_lisp_get_map_request_mode (); })); - /* *INDENT-ON* */ } static void @@ -362,13 +358,11 @@ vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_USE_PETR_REPLY, { rmp->is_petr_enable = status; ip_address_encode2 (&gid_address_ip (&addr), &rmp->ip_address); }); - /* *INDENT-ON* */ } static void @@ -589,7 +583,6 @@ vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp) return; filter = mp->filter; - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { if (filter && !((1 == filter && lsit->local) || @@ -600,7 +593,6 @@ vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp) send_lisp_locator_set_details (lcm, lsit, reg, mp->context, lsit - lcm->locator_set_pool); } - /* *INDENT-ON* */ } static void @@ -703,13 +695,11 @@ vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp) } else { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { send_lisp_eid_table_details(mapit, reg, mp->context, mp->filter); } - /* *INDENT-ON* */ } } @@ -820,12 +810,10 @@ vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t * vni_table = lcm->table_id_by_vni; } - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ send_eid_table_map_pair (p, reg, mp->context); })); - /* *INDENT-ON* */ } static void @@ -868,12 +856,10 @@ static void vl_api_show_lisp_rloc_probe_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_RLOC_PROBE_STATE_REPLY, { rmp->is_enabled = vnet_lisp_rloc_probe_state_get (); }); - /* *INDENT-ON* */ } static void @@ -883,12 +869,10 @@ static void vl_api_show_lisp_map_register_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_LISP_MAP_REGISTER_STATE_REPLY, { rmp->is_enabled = vnet_lisp_map_register_state_get (); }); - /* *INDENT-ON* */ } static void @@ -903,13 +887,11 @@ vl_api_lisp_adjacencies_get_t_handler (vl_api_lisp_adjacencies_get_t * mp) adjs = vnet_lisp_adjacencies_get_by_vni (vni); size = vec_len (adjs) * sizeof (vl_api_lisp_adjacency_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_LISP_ADJACENCIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (adjs)); lisp_adjacency_copy (rmp->adjacencies, adjs); }); - /* *INDENT-ON* */ vec_free (adjs); } @@ -927,7 +909,6 @@ vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t * if (!reg) return; - /* *INDENT-OFF* */ hash_foreach_pair (p, lcm->table_id_by_vni, ({ hash_set (vnis, p->key, 0); @@ -942,7 +923,6 @@ vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t * ({ send_eid_table_vni (p->key, reg, mp->context); })); - /* *INDENT-ON* */ hash_free (vnis); } @@ -953,13 +933,11 @@ vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp) vl_api_show_lisp_status_reply_t *rmp = NULL; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY, ({ rmp->is_gpe_enabled = vnet_lisp_gpe_enable_disable_status (); rmp->is_lisp_enabled = vnet_lisp_enable_disable_status (); })); - /* *INDENT-ON* */ } static void @@ -983,13 +961,11 @@ static void tmp_str = format (0, "%s", loc_set->name); } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY, ({ strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ vec_free (tmp_str); } @@ -1027,14 +1003,12 @@ vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY, ({ rmp->is_enabled = lcm->flags & LISP_FLAG_PITR_MODE; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } /* diff --git a/src/plugins/lisp/lisp-cp/lisp_cli.c b/src/plugins/lisp/lisp-cp/lisp_cli.c index 569d695b033..6c15898216d 100644 --- a/src/plugins/lisp/lisp-cp/lisp_cli.c +++ b/src/plugins/lisp/lisp-cp/lisp_cli.c @@ -64,13 +64,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_adjacencies_command) = { .path = "show lisp adjacencies", .short_help = "show lisp adjacencies", .function = lisp_show_adjacencies_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_map_server_command_fn (vlib_main_t * vm, @@ -120,13 +118,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_server_command) = { .path = "lisp map-server", .short_help = "lisp map-server add|del <ip>", .function = lisp_add_del_map_server_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -227,14 +223,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = { .path = "lisp eid-table", .short_help = "lisp eid-table add/del [vni <vni>] eid <eid> " "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]", .function = lisp_add_del_local_eid_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_eid_table_map_command_fn (vlib_main_t * vm, @@ -274,13 +268,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_eid_table_map_command) = { .path = "lisp eid-table map", .short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>", .function = lisp_eid_table_map_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del remote mapping CLI. @@ -418,7 +410,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = { .path = "lisp remote-mapping", .short_help = "lisp remote-mapping add|del [del-all] vni <vni> " @@ -427,7 +418,6 @@ VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = { "w <weight> [rloc <dst-locator> ... ]", .function = lisp_add_del_remote_mapping_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del adjacency CLI. @@ -525,14 +515,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = { .path = "lisp adjacency", .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> " "leid <local-eid>", .function = lisp_add_del_adjacency_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -575,13 +563,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_map_request_mode_command) = { .path = "lisp map-request mode", .short_help = "lisp map-request mode dst-only|src-dst", .function = lisp_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static u8 * @@ -609,13 +595,11 @@ lisp_show_map_request_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_request_mode_command) = { .path = "show lisp map-request mode", .short_help = "show lisp map-request mode", .function = lisp_show_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_resolvers_command_fn (vlib_main_t * vm, @@ -632,13 +616,11 @@ lisp_show_map_resolvers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = { .path = "show lisp map-resolvers", .short_help = "show lisp map-resolvers", .function = lisp_show_map_resolvers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -691,13 +673,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = { .path = "lisp pitr", .short_help = "lisp pitr [disable] ls <locator-set-name>", .function = lisp_pitr_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_pitr_command_fn (vlib_main_t * vm, @@ -744,13 +724,11 @@ lisp_show_pitr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_pitr_command) = { .path = "show lisp pitr", .short_help = "Show pitr", .function = lisp_show_pitr_command_fn, }; -/* *INDENT-ON* */ static u8 * format_eid_entry (u8 * s, va_list * args) @@ -840,7 +818,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, if (print_all) { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { if (mapit->pitr_set) @@ -856,7 +833,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, lcm, mapit, ls); } - /* *INDENT-ON* */ } else { @@ -884,13 +860,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = { .path = "show lisp eid-table", .short_help = "show lisp eid-table [local|remote|eid <eid>]", .function = lisp_show_eid_table_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -906,13 +880,11 @@ lisp_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_enable_command) = { .path = "lisp enable", .short_help = "lisp enable", .function = lisp_enable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -927,13 +899,11 @@ lisp_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_disable_command) = { .path = "lisp disable", .short_help = "lisp disable", .function = lisp_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_enable_disable_command_fn (vlib_main_t * vm, @@ -980,13 +950,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_map_register_enable_disable_command) = { .path = "lisp map-register", .short_help = "lisp map-register [enable|disable]", .function = lisp_map_register_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm, @@ -1033,13 +1001,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_rloc_probe_enable_disable_command) = { .path = "lisp rloc-probe", .short_help = "lisp rloc-probe [enable|disable]", .function = lisp_rloc_probe_enable_disable_command_fn, }; -/* *INDENT-ON* */ static u8 * format_lisp_status (u8 * s, va_list * args) @@ -1060,13 +1026,11 @@ lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_status_command) = { .path = "show lisp status", .short_help = "show lisp status", .function = lisp_show_status_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_eid_table_map_command_fn (vlib_main_t * vm, @@ -1112,12 +1076,10 @@ lisp_show_eid_table_map_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -1125,13 +1087,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = { .path = "show lisp eid-table map", .short_help = "show lisp eid-table map l2|l3", .function = lisp_show_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1201,14 +1161,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = { .path = "lisp locator-set", .short_help = "lisp locator-set add/del <name> [iface <iface-name> " "p <priority> w <weight>]", .function = lisp_add_del_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, @@ -1277,14 +1235,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = { .path = "lisp locator", .short_help = "lisp locator add/del locator-set <name> iface <iface-name> " "p <priority> w <weight>", .function = lisp_add_del_locator_in_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, @@ -1299,7 +1255,6 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator", "Priority", "Weight"); - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { u8 * msg = 0; @@ -1331,17 +1286,14 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%v", msg); vec_free (msg); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = { .path = "show lisp locator-set", .short_help = "Shows locator-sets", .function = lisp_cp_show_locator_sets_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1396,13 +1348,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = { .path = "lisp map-resolver", .short_help = "lisp map-resolver add/del <ip_address>", .function = lisp_add_del_map_resolver_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1451,13 +1401,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = { .path = "lisp map-request itr-rlocs", .short_help = "lisp map-request itr-rlocs add/del <locator_set_name>", .function = lisp_add_del_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, @@ -1481,13 +1429,11 @@ lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_map_request_command) = { .path = "show lisp map-request itr-rlocs", .short_help = "Shows map-request itr-rlocs", .function = lisp_show_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_use_petr_set_locator_set_command_fn (vlib_main_t * vm, @@ -1534,7 +1480,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_use_petr_set_locator_set_command) = { .path = "lisp use-petr", .short_help = "lisp use-petr [disable] <petr-ip>", @@ -1586,13 +1531,11 @@ lisp_show_petr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_petr_command) = { .path = "show lisp petr", .short_help = "Show petr", .function = lisp_show_petr_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/lisp_cp_test.c b/src/plugins/lisp/lisp-cp/lisp_cp_test.c index 8657aae0bb1..a6c3ca92ce0 100644 --- a/src/plugins/lisp/lisp-cp/lisp_cp_test.c +++ b/src/plugins/lisp/lisp-cp/lisp_cp_test.c @@ -116,7 +116,6 @@ format_lisp_eid_vat (u8 * s, va_list * args) -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef struct lisp_eid_vat_t_ { @@ -130,7 +129,6 @@ typedef struct lisp_eid_vat_t_ /**< type of eid */ u8 type; } __clib_packed lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-cp/lisp_types.h b/src/plugins/lisp/lisp-cp/lisp_types.h index 324320b4758..21bd72178d7 100644 --- a/src/plugins/lisp/lisp-cp/lisp_types.h +++ b/src/plugins/lisp/lisp-cp/lisp_types.h @@ -238,7 +238,6 @@ void gid_address_ip_set (gid_address_t * dst, void *src, u8 version); _(nsh) \ _(sd) -/* *INDENT-OFF* */ #define _(_n) \ u16 _n ## _size_to_write (void * pref); \ u16 _n ## _write (u8 * p, void * pref); \ @@ -248,7 +247,6 @@ void _n ## _copy (void * dst , void * src); foreach_gid_address_type_fcns #undef _ -/* *INDENT-ON* */ always_inline u64 mac_to_u64 (u8 * m) diff --git a/src/plugins/lisp/lisp-cp/one_api.c b/src/plugins/lisp/lisp-cp/one_api.c index c88c45e1712..b5b523433f2 100644 --- a/src/plugins/lisp/lisp-cp/one_api.c +++ b/src/plugins/lisp/lisp-cp/one_api.c @@ -160,12 +160,10 @@ static void int rv = 0; u32 ttl = vnet_lisp_map_register_get_ttl (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_TTL_REPLY, ({ rmp->ttl = clib_host_to_net_u32 (ttl); })); - /* *INDENT-ON* */ } static void @@ -212,12 +210,10 @@ vl_api_one_add_del_locator_set_t_handler (vl_api_one_add_del_locator_set_t * vec_free (locator_name); vec_free (a->locators); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_ADD_DEL_LOCATOR_SET_REPLY, ({ rmp->ls_index = clib_host_to_net_u32 (ls_index); })); - /* *INDENT-ON* */ } static void @@ -466,12 +462,10 @@ static void int rv = 0; vl_api_show_one_map_request_mode_reply_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_MAP_REQUEST_MODE_REPLY, ({ rmp->mode = vnet_lisp_get_map_request_mode (); })); - /* *INDENT-ON* */ } static void @@ -559,7 +553,6 @@ vl_api_show_one_use_petr_t_handler (vl_api_show_one_use_petr_t * mp) } } - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_USE_PETR_REPLY, { rmp->status = status; @@ -567,7 +560,6 @@ vl_api_show_one_use_petr_t_handler (vl_api_show_one_use_petr_t * mp) ip_address_encode2 (ip, &rmp->ip_address); }); - /* *INDENT-ON* */ } static void @@ -789,7 +781,6 @@ vl_api_one_locator_set_dump_t_handler (vl_api_one_locator_set_dump_t * mp) return; filter = mp->filter; - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { if (filter && !((1 == filter && lsit->local) || @@ -800,7 +791,6 @@ vl_api_one_locator_set_dump_t_handler (vl_api_one_locator_set_dump_t * mp) send_one_locator_set_details (lcm, lsit, reg, mp->context, lsit - lcm->locator_set_pool); } - /* *INDENT-ON* */ } static void @@ -919,13 +909,11 @@ vl_api_one_eid_table_dump_t_handler (vl_api_one_eid_table_dump_t * mp) } else { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { send_one_eid_table_details(mapit, reg, mp->context, mp->filter); } - /* *INDENT-ON* */ } } @@ -1034,12 +1022,10 @@ vl_api_one_eid_table_map_dump_t_handler (vl_api_one_eid_table_map_dump_t * mp) vni_table = lcm->table_id_by_vni; } - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ send_eid_table_map_pair (p, reg, mp->context); })); - /* *INDENT-ON* */ } static void @@ -1112,12 +1098,10 @@ static void vl_api_show_one_rloc_probe_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_RLOC_PROBE_STATE_REPLY, { rmp->is_enable = vnet_lisp_rloc_probe_state_get (); }); - /* *INDENT-ON* */ } static void @@ -1127,12 +1111,10 @@ static void vl_api_show_one_map_register_state_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_STATE_REPLY, { rmp->is_enable = vnet_lisp_map_register_state_get (); }); - /* *INDENT-ON* */ } static void @@ -1147,13 +1129,11 @@ vl_api_one_adjacencies_get_t_handler (vl_api_one_adjacencies_get_t * mp) adjs = vnet_lisp_adjacencies_get_by_vni (vni); size = vec_len (adjs) * sizeof (vl_api_one_adjacency_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_ADJACENCIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (adjs)); one_adjacency_copy (rmp->adjacencies, adjs); }); - /* *INDENT-ON* */ vec_free (adjs); } @@ -1170,7 +1150,6 @@ vl_api_one_eid_table_vni_dump_t_handler (vl_api_one_eid_table_vni_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ hash_foreach_pair (p, lcm->table_id_by_vni, ({ hash_set (vnis, p->key, 0); @@ -1185,7 +1164,6 @@ vl_api_one_eid_table_vni_dump_t_handler (vl_api_one_eid_table_vni_dump_t * mp) ({ send_eid_table_vni (p->key, reg, mp->context); })); - /* *INDENT-ON* */ hash_free (vnis); } @@ -1196,13 +1174,11 @@ vl_api_show_one_status_t_handler (vl_api_show_one_status_t * mp) vl_api_show_one_status_reply_t *rmp = NULL; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_STATUS_REPLY, ({ rmp->gpe_status = vnet_lisp_gpe_enable_disable_status (); rmp->feature_status = vnet_lisp_enable_disable_status (); })); - /* *INDENT-ON* */ } static void @@ -1226,13 +1202,11 @@ static void tmp_str = format (0, "%s", loc_set->name); } - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_ONE_GET_MAP_REQUEST_ITR_RLOCS_REPLY, ({ strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ vec_free (tmp_str); } @@ -1269,14 +1243,12 @@ vl_api_show_one_nsh_mapping_t_handler (vl_api_show_one_nsh_mapping_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_NSH_MAPPING_REPLY, ({ rmp->is_set = is_set; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } static void @@ -1312,14 +1284,12 @@ vl_api_show_one_pitr_t_handler (vl_api_show_one_pitr_t * mp) } vec_add1 (tmp_str, 0); - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_SHOW_ONE_PITR_REPLY, ({ rmp->status = lcm->flags & LISP_FLAG_PITR_MODE; strncpy((char *) rmp->locator_set_name, (char *) tmp_str, ARRAY_LEN(rmp->locator_set_name) - 1); })); - /* *INDENT-ON* */ } static void @@ -1329,12 +1299,10 @@ static void vl_api_show_one_stats_enable_disable_reply_t *rmp = NULL; vnet_api_error_t rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, ({ rmp->is_enable = vnet_lisp_stats_enable_disable_state (); })); - /* *INDENT-ON* */ } static void @@ -1366,7 +1334,6 @@ vl_api_one_stats_dump_t_handler (vl_api_one_stats_dump_t * mp) stats = vnet_lisp_get_stats (); vec_foreach (stat, stats) { - /* *INDENT-OFF* */ REPLY_DETAILS (VL_API_ONE_STATS_DETAILS, ({ fid_to_api_eid (&stat->deid, &rmp->deid); @@ -1379,7 +1346,6 @@ vl_api_one_stats_dump_t_handler (vl_api_one_stats_dump_t * mp) rmp->pkt_count = clib_host_to_net_u32 (stat->counters.packets); rmp->bytes = clib_host_to_net_u32 (stat->counters.bytes); })); - /* *INDENT-ON* */ } } @@ -1439,7 +1405,6 @@ vl_api_one_ndp_bd_get_t_handler (vl_api_one_ndp_bd_get_t * mp) u32 *bds = vnet_lisp_ndp_bds_get (); u32 size = hash_elts (bds) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_NDP_BD_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (bds)); @@ -1448,7 +1413,6 @@ vl_api_one_ndp_bd_get_t_handler (vl_api_one_ndp_bd_get_t * mp) rmp->bridge_domains[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (bds); } @@ -1464,7 +1428,6 @@ vl_api_one_l2_arp_bd_get_t_handler (vl_api_one_l2_arp_bd_get_t * mp) u32 *bds = vnet_lisp_l2_arp_bds_get (); u32 size = hash_elts (bds) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_L2_ARP_BD_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (bds)); @@ -1473,7 +1436,6 @@ vl_api_one_l2_arp_bd_get_t_handler (vl_api_one_l2_arp_bd_get_t * mp) rmp->bridge_domains[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (bds); } @@ -1491,7 +1453,6 @@ vl_api_one_l2_arp_entries_get_t_handler (vl_api_one_l2_arp_entries_get_t * mp) entries = vnet_lisp_l2_arp_entries_get_by_bd (bd); u32 size = vec_len (entries) * sizeof (vl_api_one_l2_arp_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_L2_ARP_ENTRIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (entries)); @@ -1502,7 +1463,6 @@ vl_api_one_l2_arp_entries_get_t_handler (vl_api_one_l2_arp_entries_get_t * mp) i++; } }); - /* *INDENT-ON* */ vec_free (entries); } @@ -1528,12 +1488,10 @@ static void u32 value = vnet_lisp_map_register_fallback_threshold_get (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, ({ rmp->value = clib_host_to_net_u32 (value); })); - /* *INDENT-ON* */ } static void @@ -1556,12 +1514,10 @@ static void int rv = 0; u8 proto = (u8) vnet_lisp_get_transport_protocol (); - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_GET_TRANSPORT_PROTOCOL_REPLY, ({ rmp->protocol = proto; })); - /* *INDENT-ON* */ } static void @@ -1577,7 +1533,6 @@ vl_api_one_ndp_entries_get_t_handler (vl_api_one_ndp_entries_get_t * mp) entries = vnet_lisp_ndp_entries_get_by_bd (bd); u32 size = vec_len (entries) * sizeof (vl_api_one_ndp_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_ONE_NDP_ENTRIES_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (vec_len (entries)); @@ -1588,7 +1543,6 @@ vl_api_one_ndp_entries_get_t_handler (vl_api_one_ndp_entries_get_t * mp) i++; } }); - /* *INDENT-ON* */ vec_free (entries); } @@ -1609,12 +1563,10 @@ vl_api_one_show_xtr_mode_t_handler (vl_api_one_show_xtr_mode_t * mp) vl_api_one_show_xtr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_XTR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_xtr_mode (); }); - /* *INDENT-ON* */ } static void @@ -1633,12 +1585,10 @@ vl_api_one_show_pitr_mode_t_handler (vl_api_one_show_pitr_mode_t * mp) vl_api_one_show_pitr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_PITR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_pitr_mode (); }); - /* *INDENT-ON* */ } static void @@ -1657,12 +1607,10 @@ vl_api_one_show_petr_mode_t_handler (vl_api_one_show_petr_mode_t * mp) vl_api_one_show_petr_mode_reply_t *rmp = 0; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_ONE_SHOW_PETR_MODE_REPLY, { rmp->is_enable = vnet_lisp_get_petr_mode (); }); - /* *INDENT-ON* */ } /* @@ -1687,12 +1635,10 @@ VLIB_API_INIT_FUNCTION (one_api_hookup); #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Locator ID Separation Protocol (LISP)", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/one_cli.c b/src/plugins/lisp/lisp-cp/one_cli.c index b85fea16ea7..8658d5fafd7 100644 --- a/src/plugins/lisp/lisp-cp/one_cli.c +++ b/src/plugins/lisp/lisp-cp/one_cli.c @@ -62,13 +62,11 @@ lisp_show_adjacencies_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_adjacencies_command) = { .path = "show one adjacencies", .short_help = "show one adjacencies", .function = lisp_show_adjacencies_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_map_server_command_fn (vlib_main_t * vm, @@ -116,13 +114,11 @@ lisp_add_del_map_server_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_server_command) = { .path = "one map-server", .short_help = "one map-server add|del <ip>", .function = lisp_add_del_map_server_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -224,14 +220,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_local_eid_command) = { .path = "one eid-table", .short_help = "one eid-table add/del [vni <vni>] eid <eid> " "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]", .function = lisp_add_del_local_eid_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_eid_table_map_command_fn (vlib_main_t * vm, @@ -271,13 +265,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_eid_table_map_command) = { .path = "one eid-table map", .short_help = "one eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>", .function = lisp_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_ndp_entry_command_fn (vlib_main_t * vm, @@ -335,13 +327,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_ndp_entry_command) = { .path = "one ndp", .short_help = "one ndp [del] bd <bd> mac <mac> ip <ipv6>", .function = lisp_add_del_ndp_entry_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_l2_arp_entry_command_fn (vlib_main_t * vm, @@ -399,13 +389,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_l2_arp_entry_command) = { .path = "one l2 arp", .short_help = "one l2 arp [del] bd <bd> mac <mac> ip <ipv4>", .function = lisp_add_del_l2_arp_entry_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, @@ -416,7 +404,6 @@ lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, lisp_api_l2_arp_entry_t *entries, *e; hash_pair_t *p; - /* *INDENT-OFF* */ hash_foreach_pair (p, ht, ({ entries = vnet_lisp_l2_arp_entries_get_by_bd (p->key); @@ -429,19 +416,16 @@ lisp_show_l2_arp_entries_command_fn (vlib_main_t * vm, } vec_free (entries); })); - /* *INDENT-ON* */ hash_free (ht); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_l2_arp_entries_command) = { .path = "show one l2 arp entries", .short_help = "Show ONE L2 ARP entries", .function = lisp_show_l2_arp_entries_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_ndp_entries_command_fn (vlib_main_t * vm, @@ -452,7 +436,6 @@ lisp_show_ndp_entries_command_fn (vlib_main_t * vm, lisp_api_ndp_entry_t *entries, *e; hash_pair_t *p; - /* *INDENT-OFF* */ hash_foreach_pair (p, ht, ({ entries = vnet_lisp_ndp_entries_get_by_bd (p->key); @@ -465,19 +448,16 @@ lisp_show_ndp_entries_command_fn (vlib_main_t * vm, } vec_free (entries); })); - /* *INDENT-ON* */ hash_free (ht); return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_ndp_entries_command) = { .path = "show one ndp entries", .short_help = "Show ONE NDP entries", .function = lisp_show_ndp_entries_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del remote mapping CLI. @@ -613,7 +593,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_remote_mapping_command) = { .path = "one remote-mapping", .short_help = @@ -623,7 +602,6 @@ VLIB_CLI_COMMAND (one_add_del_remote_mapping_command) = { "[rloc <dst-locator> ... ]", .function = lisp_add_del_remote_mapping_command_fn, }; -/* *INDENT-ON* */ /** * Handler for add/del adjacency CLI. @@ -721,14 +699,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_adjacency_command) = { .path = "one adjacency", .short_help = "one adjacency add|del vni <vni> reid <remote-eid> " "leid <local-eid>", .function = lisp_add_del_adjacency_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -770,13 +746,11 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_request_mode_command) = { .path = "one map-request mode", .short_help = "one map-request mode dst-only|src-dst", .function = lisp_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static u8 * @@ -804,13 +778,11 @@ lisp_show_map_request_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_request_mode_command) = { .path = "show one map-request mode", .short_help = "show one map-request mode", .function = lisp_show_map_request_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_resolvers_command_fn (vlib_main_t * vm, @@ -827,13 +799,11 @@ lisp_show_map_resolvers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_resolvers_command) = { .path = "show one map-resolvers", .short_help = "show one map-resolvers", .function = lisp_show_map_resolvers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_nsh_set_locator_set_command_fn (vlib_main_t * vm, @@ -884,13 +854,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_nsh_set_locator_set_command) = { .path = "one nsh-mapping", .short_help = "one nsh-mapping [del] ls <locator-set-name>", .function = lisp_nsh_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_fallback_threshold_show_command_fn (vlib_main_t * vm, @@ -904,14 +872,12 @@ lisp_map_register_fallback_threshold_show_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_fallback_threshold_show_command) = { .path = "show one map-register fallback-threshold", .short_help = "show one map-register fallback-threshold", .function = lisp_map_register_fallback_threshold_show_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_fallback_threshold_command_fn (vlib_main_t * vm, @@ -949,13 +915,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_fallback_threshold_command) = { .path = "one map-register fallback-threshold", .short_help = "one map-register fallback-threshold <count>", .function = lisp_map_register_fallback_threshold_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm, @@ -1006,13 +970,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_pitr_set_locator_set_command) = { .path = "one pitr", .short_help = "one pitr [disable] ls <locator-set-name>", .function = lisp_pitr_set_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_pitr_command_fn (vlib_main_t * vm, @@ -1059,13 +1021,11 @@ lisp_show_pitr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_pitr_command) = { .path = "show one pitr", .short_help = "Show pitr", .function = lisp_show_pitr_command_fn, }; -/* *INDENT-ON* */ static u8 * format_eid_entry (u8 * s, va_list * args) @@ -1156,7 +1116,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, if (print_all) { - /* *INDENT-OFF* */ pool_foreach (mapit, lcm->mapping_pool) { if (mapit->pitr_set || mapit->nsh_set) @@ -1172,7 +1131,6 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, lcm, mapit, ls); } - /* *INDENT-ON* */ } else { @@ -1200,13 +1158,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_eid_table_command) = { .path = "show one eid-table", .short_help = "show one eid-table [local|remote|eid <eid>]", .function = lisp_show_eid_table_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_enable_disable_pitr_mode_command_fn (vlib_main_t * vm, @@ -1253,13 +1209,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_pitr_mode_command) = { .path = "one pitr mode", .short_help = "one pitr mode [enable|disable]", .function = lisp_enable_disable_pitr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1307,13 +1261,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_petr_mode_command) = { .path = "one petr mode", .short_help = "one petr mode [enable|disable]", .function = lisp_enable_disable_petr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_enable_disable_xtr_mode_command_fn (vlib_main_t * vm, @@ -1360,13 +1312,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_disable_xtr_mode_command) = { .path = "one xtr mode", .short_help = "one xtr mode [enable|disable]", .function = lisp_enable_disable_xtr_mode_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * one_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -1381,13 +1331,11 @@ one_enable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_enable_command) = { .path = "one enable", .short_help = "one enable", .function = one_enable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * one_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -1402,13 +1350,11 @@ one_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_disable_command) = { .path = "one disable", .short_help = "one disable", .function = one_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_set_ttl_command_fn (vlib_main_t * vm, @@ -1449,13 +1395,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_set_ttl_command) = { .path = "one map-register ttl", .short_help = "one map-register ttl", .function = lisp_map_register_set_ttl_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_show_ttl_command_fn (vlib_main_t * vm, @@ -1468,14 +1412,12 @@ lisp_map_register_show_ttl_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_show_ttl_command) = { .path = "show one map-register ttl", .short_help = "show one map-register ttl", .function = lisp_map_register_show_ttl_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_map_register_enable_disable_command_fn (vlib_main_t * vm, @@ -1522,13 +1464,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_map_register_enable_disable_command) = { .path = "one map-register", .short_help = "one map-register [enable|disable]", .function = lisp_map_register_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm, @@ -1575,13 +1515,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_rloc_probe_enable_disable_command) = { .path = "one rloc-probe", .short_help = "one rloc-probe [enable|disable]", .function = lisp_rloc_probe_enable_disable_command_fn, }; -/* *INDENT-ON* */ static u8 * format_lisp_status (u8 * s, va_list * args) @@ -1602,13 +1540,11 @@ lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_status_command) = { .path = "show one status", .short_help = "show one status", .function = lisp_show_status_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_eid_table_map_command_fn (vlib_main_t * vm, @@ -1654,12 +1590,10 @@ lisp_show_eid_table_map_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); - /* *INDENT-OFF* */ hash_foreach_pair (p, vni_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ done: unformat_free (line_input); @@ -1667,13 +1601,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_eid_table_map_command) = { .path = "show one eid-table map", .short_help = "show one eid-table map l2|l3", .function = lisp_show_eid_table_map_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1742,14 +1674,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_add_del_locator_set_command) = { .path = "one locator-set", .short_help = "one locator-set add/del <name> [iface <iface-name> " "p <priority> w <weight>]", .function = lisp_add_del_locator_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, @@ -1818,14 +1748,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_add_del_locator_in_set_command) = { .path = "one locator", .short_help = "one locator add/del locator-set <name> iface <iface-name> " "p <priority> w <weight>", .function = lisp_add_del_locator_in_set_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, @@ -1840,7 +1768,6 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator", "Priority", "Weight"); - /* *INDENT-OFF* */ pool_foreach (lsit, lcm->locator_set_pool) { u8 * msg = 0; @@ -1872,17 +1799,14 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%v", msg); vec_free (msg); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_locator_sets_command) = { .path = "show one locator-set", .short_help = "Shows locator-sets", .function = lisp_cp_show_locator_sets_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1936,13 +1860,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_resolver_command) = { .path = "one map-resolver", .short_help = "one map-resolver add/del <ip_address>", .function = lisp_add_del_map_resolver_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -1991,13 +1913,11 @@ done: } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_add_del_map_request_command) = { .path = "one map-request itr-rlocs", .short_help = "one map-request itr-rlocs add/del <locator_set_name>", .function = lisp_add_del_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, @@ -2021,13 +1941,11 @@ lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_request_command) = { .path = "show one map-request itr-rlocs", .short_help = "Shows map-request itr-rlocs", .function = lisp_show_mreq_itr_rlocs_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_use_petr_set_locator_set_command_fn (vlib_main_t * vm, @@ -2073,7 +1991,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_use_petr_set_locator_set_command) = { .path = "one use-petr", .short_help = "one use-petr [disable] <petr-ip>", @@ -2125,13 +2042,11 @@ lisp_show_petr_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_petr_command) = { .path = "show one petr", .short_help = "Show petr", .function = lisp_show_petr_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_servers_command_fn (vlib_main_t * vm, @@ -2148,13 +2063,11 @@ lisp_show_map_servers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_servers_command) = { .path = "show one map-servers", .short_help = "show one map servers", .function = lisp_show_map_servers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_map_register_state_command_fn (vlib_main_t * vm, @@ -2170,13 +2083,11 @@ lisp_show_map_register_state_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_map_register_state_command) = { .path = "show one map-register state", .short_help = "show one map-register state", .function = lisp_show_map_register_state_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_rloc_probe_state_command_fn (vlib_main_t * vm, @@ -2192,13 +2103,11 @@ lisp_show_rloc_probe_state_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_rloc_probe_state_command) = { .path = "show one rloc state", .short_help = "show one RLOC state", .function = lisp_show_rloc_probe_state_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_stats_command_fn (vlib_main_t * vm, @@ -2210,13 +2119,11 @@ lisp_show_stats_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_stats_command) = { .path = "show one statistics status", .short_help = "show ONE statistics enable/disable status", .function = lisp_show_stats_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_stats_details_command_fn (vlib_main_t * vm, @@ -2244,13 +2151,11 @@ lisp_show_stats_details_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_show_stats_details_command) = { .path = "show one statistics details", .short_help = "show ONE statistics", .function = lisp_show_stats_details_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_stats_enable_disable_command_fn (vlib_main_t * vm, @@ -2282,13 +2187,11 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_stats_enable_disable_command) = { .path = "one statistics", .short_help = "enable/disable ONE statistics collecting", .function = lisp_stats_enable_disable_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_stats_flush_command_fn (vlib_main_t * vm, @@ -2299,13 +2202,11 @@ lisp_stats_flush_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_stats_flush_command) = { .path = "one statistics flush", .short_help = "Flush ONE statistics", .function = lisp_stats_flush_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_show_one_modes_command_fn (vlib_main_t * vm, @@ -2323,13 +2224,11 @@ lisp_show_one_modes_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (one_cp_show_one_modes_modes_command) = { .path = "show one modes", .short_help = "show one modes", .function = lisp_show_one_modes_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/one_test.c b/src/plugins/lisp/lisp-cp/one_test.c index ad308b73c5e..475b52de15e 100644 --- a/src/plugins/lisp/lisp-cp/one_test.c +++ b/src/plugins/lisp/lisp-cp/one_test.c @@ -671,7 +671,6 @@ vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) vam->result_ready = 1; } -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef CLIB_PACKED(struct{ union { @@ -682,7 +681,6 @@ typedef CLIB_PACKED(struct{ u32 len; /**< prefix length if IP */ u8 type; /**< type of eid */ }) lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-cp/packets.c b/src/plugins/lisp/lisp-cp/packets.c index 3f4292b4841..6c36a550ab4 100644 --- a/src/plugins/lisp/lisp-cp/packets.c +++ b/src/plugins/lisp/lisp-cp/packets.c @@ -217,7 +217,6 @@ pkt_push_ecm_hdr (vlib_buffer_t * b) return h; } -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-cp/packets.h b/src/plugins/lisp/lisp-cp/packets.h index 68cd949e75d..c10fdb28c79 100644 --- a/src/plugins/lisp/lisp-cp/packets.h +++ b/src/plugins/lisp/lisp-cp/packets.h @@ -27,7 +27,6 @@ void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, void *pkt_push_ecm_hdr (vlib_buffer_t * b); -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-gpe/decap.c b/src/plugins/lisp/lisp-gpe/decap.c index 59fd5646ee7..18e32675a32 100644 --- a/src/plugins/lisp/lisp-gpe/decap.c +++ b/src/plugins/lisp/lisp-gpe/decap.c @@ -456,7 +456,6 @@ static char *lisp_gpe_ip4_input_error_strings[] = { #undef lisp_gpe_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = { .function = lisp_gpe_ip4_input, .name = "lisp-gpe-ip4-input", @@ -476,9 +475,7 @@ VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = { .format_trace = format_lisp_gpe_rx_trace, // $$$$ .unformat_buffer = unformat_lisp_gpe_header, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = { .function = lisp_gpe_ip6_input, .name = "lisp-gpe-ip6-input", @@ -498,7 +495,6 @@ VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = { .format_trace = format_lisp_gpe_rx_trace, // $$$$ .unformat_buffer = unformat_lisp_gpe_header, }; -/* *INDENT-ON* */ /** * Adds arc from lisp-gpe-input to nsh-input if nsh-input is available @@ -556,7 +552,6 @@ static char *lisp_gpe_nsh_placeholder_error_strings[] = { "lisp gpe placeholder nsh decap", }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (lisp_gpe_nsh_placeholder_input_node) = { .function = lisp_gpe_nsh_placeholder_input, .name = "lisp-gpe-nsh-placeholder-input", @@ -571,7 +566,6 @@ VLIB_REGISTER_NODE (lisp_gpe_nsh_placeholder_input_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ static clib_error_t * lisp_add_placeholder_nsh_node_command_fn (vlib_main_t * vm, @@ -586,12 +580,10 @@ lisp_add_placeholder_nsh_node_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_add_placeholder_nsh_node_command, static) = { .path = "test one nsh add-placeholder-decap-node", .function = lisp_add_placeholder_nsh_node_command_fn, }; -/* *INDENT-ON* */ VLIB_INIT_FUNCTION (gpe_decap_init); diff --git a/src/plugins/lisp/lisp-gpe/interface.c b/src/plugins/lisp/lisp-gpe/interface.c index 05669ae975f..ed2b08f9aaf 100644 --- a/src/plugins/lisp/lisp-gpe/interface.c +++ b/src/plugins/lisp/lisp-gpe/interface.c @@ -158,12 +158,10 @@ format_lisp_gpe_name (u8 * s, va_list * args) return format (s, "lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (lisp_gpe_device_class) = { .name = "LISP_GPE", .format_device_name = format_lisp_gpe_name, }; -/* *INDENT-ON* */ u8 * format_lisp_gpe_header_with_length (u8 * s, va_list * args) @@ -188,14 +186,12 @@ format_lisp_gpe_header_with_length (u8 * s, va_list * args) return s; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (lisp_gpe_hw_class) = { .name = "LISP_GPE", .format_header = format_lisp_gpe_header_with_length, .build_rewrite = lisp_gpe_build_rewrite, .update_adjacency = lisp_gpe_update_adjacency, }; -/* *INDENT-ON* */ typedef struct @@ -300,14 +296,12 @@ format_l2_lisp_gpe_name (u8 * s, va_list * args) return format (s, "l2_lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (l2_lisp_gpe_device_class,static) = { .name = "L2_LISP_GPE", .format_device_name = format_l2_lisp_gpe_name, .format_tx_trace = format_l2_lisp_gpe_tx_trace, .tx_function = l2_lisp_gpe_interface_tx, }; -/* *INDENT-ON* */ typedef struct { @@ -404,14 +398,12 @@ format_nsh_lisp_gpe_name (u8 * s, va_list * args) return format (s, "nsh_lisp_gpe%d", dev_instance); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (nsh_lisp_gpe_device_class,static) = { .name = "NSH_LISP_GPE", .format_device_name = format_nsh_lisp_gpe_name, .format_tx_trace = format_nsh_lisp_gpe_tx_trace, .tx_function = nsh_lisp_gpe_interface_tx, }; -/* *INDENT-ON* */ static vnet_hw_interface_t * lisp_gpe_create_iface (lisp_gpe_main_t * lgm, u32 vni, u32 dp_table, @@ -924,13 +916,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (add_del_lisp_gpe_iface_command, static) = { .path = "gpe iface", .short_help = "gpe iface add/del vni <vni> vrf <vrf>", .function = lisp_gpe_add_del_iface_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.c b/src/plugins/lisp/lisp-gpe/lisp_gpe.c index 1ae3131323c..7474d0fb6a5 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.c @@ -169,7 +169,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = { .path = "gpe entry", .short_help = "gpe entry add/del vni <vni> vrf/bd <id> [leid <leid>]" @@ -177,7 +176,6 @@ VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = { "[negative action <action>]", .function = lisp_gpe_add_del_fwd_entry_command_fn, }; -/* *INDENT-ON* */ /** Check if LISP-GPE is enabled. */ u8 @@ -271,13 +269,11 @@ gpe_set_encap_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_set_encap_mode_command, static) = { .path = "gpe encap", .short_help = "gpe encap [lisp|vxlan]", .function = gpe_set_encap_mode_command_fn, }; -/* *INDENT-ON* */ /** Format GPE encap mode. */ u8 * @@ -307,13 +303,11 @@ gpe_show_encap_mode_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_show_encap_mode_command, static) = { .path = "show gpe encap", .short_help = "show GPE encapulation mode", .function = gpe_show_encap_mode_command_fn, }; -/* *INDENT-ON* */ /** CLI command to enable/disable LISP-GPE. */ static clib_error_t * @@ -352,13 +346,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = { .path = "gpe", .short_help = "gpe [enable|disable]", .function = lisp_gpe_enable_disable_command_fn, }; -/* *INDENT-ON* */ /** CLI command to show LISP-GPE interfaces. */ static clib_error_t * @@ -371,31 +363,25 @@ lisp_show_iface_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index"); - /* *INDENT-OFF* */ hash_foreach_pair (p, lgm->l3_ifaces.hw_if_index_by_dp_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ if (0 != lgm->l2_ifaces.hw_if_index_by_dp_table) { vlib_cli_output (vm, "%=10s%=12s", "bd_id", "hw_if_index"); - /* *INDENT-OFF* */ hash_foreach_pair (p, lgm->l2_ifaces.hw_if_index_by_dp_table, ({ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); })); - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_show_iface_command) = { .path = "show gpe interface", .short_help = "show gpe interface", .function = lisp_show_iface_command_fn, }; -/* *INDENT-ON* */ /** CLI command to show GPE fwd native route path. */ static clib_error_t * @@ -428,13 +414,11 @@ gpe_show_native_fwd_rpath_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_show_native_fwd_rpath_command) = { .path = "show gpe native-forward", .short_help = "show gpe native-forward", .function = gpe_show_native_fwd_rpath_command_fn, }; -/* *INDENT-ON* */ void gpe_update_native_fwd_path (u8 ip_version) @@ -578,14 +562,12 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (gpe_native_forward_command) = { .path = "gpe native-forward", .short_help = "gpe native-forward [del] via <nh-ip-addr> [iface] " "[table <table>]", .function = gpe_native_forward_command_fn, }; -/* *INDENT-ON* */ /** Format LISP-GPE status. */ u8 * @@ -709,13 +691,11 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_test_nsh_command, static) = { .path = "test one nsh", .short_help = "test gpe nsh pcap <path-to-pcap-file>", .function = lisp_test_nsh_command_fn, }; -/* *INDENT-ON* */ VLIB_INIT_FUNCTION (lisp_gpe_init); diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.h b/src/plugins/lisp/lisp-gpe/lisp_gpe.h index 10dc4fe7aa7..d7e877124a1 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.h @@ -36,22 +36,18 @@ #include <vppinfra/bihash_template.h> /** IP4-UDP-LISP encap header */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_header_t ip4; /* 20 bytes */ udp_header_t udp; /* 8 bytes */ lisp_gpe_header_t lisp; /* 8 bytes */ }) ip4_udp_lisp_gpe_header_t; -/* *INDENT-ON* */ /** IP6-UDP-LISP encap header */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_header_t ip6; /* 40 bytes */ udp_header_t udp; /* 8 bytes */ lisp_gpe_header_t lisp; /* 8 bytes */ }) ip6_udp_lisp_gpe_header_t; -/* *INDENT-ON* */ #define foreach_lisp_gpe_ip_input_next \ _(DROP, "error-drop") \ diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c index 7c857b92575..562b3b5eafb 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c @@ -557,7 +557,6 @@ lisp_gpe_adjacency_show (vlib_main_t * vm, } else { - /* *INDENT-OFF* */ pool_foreach (ladj, lisp_adj_pool) { vlib_cli_output (vm, "[%d] %U\n", @@ -565,19 +564,16 @@ lisp_gpe_adjacency_show (vlib_main_t * vm, format_lisp_gpe_adjacency, ladj, LISP_GPE_ADJ_FORMAT_FLAG_NONE); } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) = { .path = "show gpe adjacency", .function = lisp_gpe_adjacency_show, }; -/* *INDENT-ON* */ #define LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (256) #define LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (1<<20) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c index df90ef54403..f77a6f4059f 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c @@ -212,7 +212,6 @@ vl_api_gpe_fwd_entry_vnis_get_t_handler (vl_api_gpe_fwd_entry_vnis_get_t * mp) u32 *vnis = vnet_lisp_gpe_get_fwd_entry_vnis (); u32 size = hash_elts (vnis) * sizeof (u32); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_FWD_ENTRY_VNIS_GET_REPLY, size, { rmp->count = clib_host_to_net_u32 (hash_elts (vnis)); @@ -221,7 +220,6 @@ vl_api_gpe_fwd_entry_vnis_get_t_handler (vl_api_gpe_fwd_entry_vnis_get_t * mp) rmp->vnis[i++] = clib_host_to_net_u32 (p->key); })); }); - /* *INDENT-ON* */ hash_free (vnis); } @@ -239,14 +237,12 @@ vl_api_gpe_fwd_entries_get_t_handler (vl_api_gpe_fwd_entries_get_t * mp) e = vnet_lisp_gpe_fwd_entries_get_by_vni (mp->vni); size = vec_len (e) * sizeof (vl_api_gpe_fwd_entry_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_FWD_ENTRIES_GET_REPLY, size, { rmp->count = vec_len (e); gpe_fwd_entries_copy (rmp->entries, e); gpe_fwd_entries_get_reply_t_host_to_net (rmp); }); - /* *INDENT-ON* */ vec_free (e); } @@ -294,12 +290,10 @@ vl_api_gpe_add_del_fwd_entry_t_handler (vl_api_gpe_add_del_fwd_entry_t * mp) rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0); vec_free (pairs); send_reply: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GPE_ADD_DEL_FWD_ENTRY_REPLY, { rmp->fwd_entry_index = clib_host_to_net_u32 (a->fwd_entry_index); }); - /* *INDENT-ON* */ } static void @@ -365,12 +359,10 @@ vl_api_gpe_get_encap_mode_t_handler (vl_api_gpe_get_encap_mode_t * mp) vl_api_gpe_get_encap_mode_reply_t *rmp; int rv = 0; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GPE_GET_ENCAP_MODE_REPLY, ({ rmp->encap_mode = vnet_gpe_get_encap_mode (); })); - /* *INDENT-ON* */ } static void @@ -464,7 +456,6 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t size = vec_len (lgm->native_fwd_rpath[rpath_index]) * sizeof (vl_api_gpe_native_fwd_rpath_t); - /* *INDENT-OFF* */ REPLY_MACRO4 (VL_API_GPE_NATIVE_FWD_RPATHS_GET_REPLY, size, { rmp->count = vec_len (lgm->native_fwd_rpath[rpath_index]); @@ -472,7 +463,6 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t lgm->native_fwd_rpath[rpath_index]); gpe_native_fwd_rpaths_get_reply_t_host_to_net (rmp); }); - /* *INDENT-ON* */ } /* diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c index 5f196fb22e3..d0d86d58391 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c @@ -1356,7 +1356,6 @@ vnet_lisp_gpe_fwd_entry_flush (void) lisp_gpe_main_t *lgm = &lisp_gpe_main; lisp_gpe_fwd_entry_t *lfe; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { switch (fid_addr_type(&lfe->key->rmt)) @@ -1372,7 +1371,6 @@ vnet_lisp_gpe_fwd_entry_flush (void) break; } } - /* *INDENT-ON* */ } static u8 * @@ -1476,7 +1474,6 @@ lisp_gpe_fwd_entry_show (vlib_main_t * vm, return (NULL); } - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { if ((vni == ~0) || @@ -1484,18 +1481,15 @@ lisp_gpe_fwd_entry_show (vlib_main_t * vm, vlib_cli_output (vm, "%U", format_lisp_gpe_fwd_entry, lfe, LISP_GPE_FWD_ENTRY_FORMAT_NONE); } - /* *INDENT-ON* */ return (NULL); } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_fwd_entry_show_command, static) = { .path = "show gpe entry", .short_help = "show gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>", .function = lisp_gpe_fwd_entry_show, }; -/* *INDENT-ON* */ clib_error_t * lisp_gpe_fwd_entry_init (vlib_main_t * vm) @@ -1521,12 +1515,10 @@ vnet_lisp_gpe_get_fwd_entry_vnis (void) lisp_gpe_fwd_entry_t *lfe; u32 *vnis = 0; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { hash_set (vnis, lfe->key->vni, 0); } - /* *INDENT-ON* */ return vnis; } @@ -1538,7 +1530,6 @@ vnet_lisp_gpe_fwd_entries_get_by_vni (u32 vni) lisp_gpe_fwd_entry_t *lfe; lisp_api_gpe_fwd_entry_t *entries = 0, e; - /* *INDENT-OFF* */ pool_foreach (lfe, lgm->lisp_fwd_entry_pool) { if (lfe->key->vni == vni) @@ -1554,7 +1545,6 @@ vnet_lisp_gpe_fwd_entries_get_by_vni (u32 vni) vec_add1 (entries, e); } } - /* *INDENT-ON* */ return entries; } diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c index c316f6c9825..4ba46c8240f 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c @@ -243,23 +243,19 @@ lisp_gpe_sub_interface_show (vlib_main_t * vm, vlib_cli_output (vm, "%-16s%=8s%=15s%s", "Name", "VNI", "sw_if_index", "local RLOC"); - /* *INDENT-OFF* */ pool_foreach (l3s, lisp_gpe_sub_interface_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_sub_interface, l3s); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_sub_interface_command) = { .path = "show gpe sub-interface", .short_help = "show gpe sub-interface", .function = lisp_gpe_sub_interface_show, }; -/* *INDENT-ON* */ static clib_error_t * lisp_gpe_sub_interface_module_init (vlib_main_t * vm) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c index b6173b273c0..450c611c5f7 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c @@ -262,13 +262,11 @@ lisp_gpe_tenant_flush (void) { lisp_gpe_tenant_t *lt; - /* *INDENT-OFF* */ pool_foreach (lt, lisp_gpe_tenant_pool) { lisp_gpe_tenant_l2_iface_unlock(lt->lt_vni); lisp_gpe_tenant_l3_iface_unlock(lt->lt_vni); } - /* *INDENT-ON* */ } /** @@ -305,23 +303,19 @@ lisp_gpe_tenant_show (vlib_main_t * vm, { lisp_gpe_tenant_t *lt; - /* *INDENT-OFF* */ pool_foreach (lt, lisp_gpe_tenant_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_tenant, lt); } - /* *INDENT-ON* */ return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_gpe_tenant_command) = { .path = "show gpe tenant", .short_help = "show gpe tenant", .function = lisp_gpe_tenant_show, }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c index 2f1a4187551..10167b14975 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c @@ -256,7 +256,6 @@ end: } -/* *INDENT-OFF* */ /** Used for parsing LISP eids */ typedef CLIB_PACKED(struct{ union { @@ -267,7 +266,6 @@ typedef CLIB_PACKED(struct{ u32 len; /**< prefix length if IP */ u8 type; /**< type of eid */ }) lisp_eid_vat_t; -/* *INDENT-ON* */ static uword unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c index 14ee095d2de..8dca55c4315 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c @@ -253,24 +253,20 @@ show_lisp_gpe_tunnel_command_fn (vlib_main_t * vm, } else { - /* *INDENT-OFF* */ pool_foreach (lgt, lisp_gpe_tunnel_pool) { vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt); } - /* *INDENT-ON* */ } return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) = { .path = "show gpe tunnel", .function = show_lisp_gpe_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * lisp_gpe_tunnel_module_init (vlib_main_t * vm) diff --git a/src/plugins/lisp/test/lisp_cp_test.c b/src/plugins/lisp/test/lisp_cp_test.c index 228ff32d010..d1908566f8e 100644 --- a/src/plugins/lisp/test/lisp_cp_test.c +++ b/src/plugins/lisp/test/lisp_cp_test.c @@ -99,7 +99,6 @@ test_lisp_msg_push_ecm () /* clear ip checksum */ clib_memset ((u8 *) ih + 10, 0, 2); - /* *INDENT-OFF* */ u8 expected_ip4_hdr[] = { 0x45, /* version; IHL */ 0x00, /* services */ @@ -112,7 +111,6 @@ test_lisp_msg_push_ecm () 0xd4, 0xc3, 0xb2, 0xa1, /* src IP */ 0x63, 0x72, 0x81, 0x90, /* dst IP */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (ih, expected_ip4_hdr, sizeof (expected_ip4_hdr))); @@ -120,14 +118,12 @@ test_lisp_msg_push_ecm () /* clear udp checksum */ clib_memset ((u8 *) uh + 6, 0, 2); - /* *INDENT-OFF* */ u8 expected_udp_hdr[] = { 0x00, 0x15, /* src port */ 0x00, 0x14, /* dst port */ 0x03, 0x8c, /* length */ 0x00, 0x00, /* checksum */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (uh, expected_udp_hdr, sizeof (expected_udp_hdr))); @@ -149,7 +145,6 @@ test_lisp_msg_parse_mapping_record () b = clib_mem_alloc (buff_len); clib_memset ((u8 *) b, 0, buff_len); - /* *INDENT-OFF* */ u8 map_reply_records[] = { /* 1. record */ 0x01, 0x02, 0x03, 0x04, /* record TTL */ @@ -167,7 +162,6 @@ test_lisp_msg_parse_mapping_record () 0x00, 0x01, /* Loc-AFI */ 0xaa, 0xbb, 0xcc, 0xdd, /* Loator */ }; - /* *INDENT-ON* */ b->current_length = buff_len; clib_memcpy (b->data, map_reply_records, sizeof (map_reply_records)); @@ -322,7 +316,6 @@ test_lisp_msg_put_mreq_with_lcaf () /* clear Nonce to simplify comparison */ clib_memset ((u8 *) h + 4, 0, 8); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x10, 0x40, 0x00, 0x01, /* type; flags; IRC; REC count */ @@ -349,7 +342,6 @@ test_lisp_msg_put_mreq_with_lcaf () 0x00, 0x01, /* EID-prefix-AFI */ 0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data))); done: @@ -377,7 +369,6 @@ test_lisp_msg_put_mreq () print_map_request (h); - /* *INDENT-OFF* */ u8 expected_data[50] = { 0x10, 0x40, 0x01, 0x01, /* type; flags; IRC; REC count */ 0x00, 0x00, 0x00, 0x00, @@ -400,7 +391,6 @@ test_lisp_msg_put_mreq () 0x00, 0x01, /* EID-prefix-AFI */ 0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data))); @@ -415,7 +405,6 @@ build_test_map_records () { mapping_t *records = 0; - /* *INDENT-OFF* */ mapping_t r = { .ttl = MAP_REGISTER_DEFAULT_TTL, .eid = { @@ -439,7 +428,6 @@ build_test_map_records () } } }; - /* *INDENT-ON* */ vec_add1 (r.locators, loc); vec_add1 (records, r); @@ -482,7 +470,6 @@ test_lisp_map_register () /* clear authentication data */ clib_memset ((u8 *) b->data + 16, 0, 20); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x30, 0x00, 0x01, 0x01, /* type; rsvd; want notify; REC count */ 0x00, 0x00, 0x00, 0x00, @@ -509,7 +496,6 @@ test_lisp_map_register () 0x00, 0x04, 0x00, 0x01, /* flags, AFI = ipv4 */ 0x66, 0x77, 0x88, 0x99, /* ipv4 locator address */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b->data, sizeof (expected_data))); done: @@ -537,20 +523,17 @@ test_lisp_parse_map_reply () { clib_error_t *error = 0; - /* *INDENT-OFF* */ u8 map_reply_data[] = { 0x00, 0x00, 0x00, 0x01, /* type; rsvd; mapping count */ 0x00, 0x00, 0x00, 0x00, }; - /* *INDENT-ON* */ vlib_buffer_t *b = create_buffer (map_reply_data, sizeof (map_reply_data)); map_records_arg_t *mrecs = parse_map_reply (b); _assert (0 == mrecs); clib_mem_free (b); - /* *INDENT-OFF* */ u8 map_reply_data2[] = { 0x00, 0x00, 0x00, 0x01, /* type; rsvd */ @@ -561,7 +544,6 @@ test_lisp_parse_map_reply () 0x01, 0x02, 0x03, 0x04, /* record TTL */ 0x01, /* locator count */ }; - /* *INDENT-ON* */ b = create_buffer (map_reply_data2, sizeof (map_reply_data2)); mrecs = parse_map_reply (b); @@ -585,7 +567,6 @@ test_lisp_parse_lcaf () b = clib_mem_alloc (buff_len); clib_memset ((u8 *) b, 0, buff_len); - /* *INDENT-OFF* */ u8 map_reply_records[] = { /* 1. record */ @@ -644,7 +625,6 @@ test_lisp_parse_lcaf () 0x00, 0x01, /* Loc-AFI */ 0xaa, 0xbb, 0xcc, 0xdd, /* Loator */ }; - /* *INDENT-ON* */ b->current_length = buff_len; memcpy (b->data, map_reply_records, sizeof (map_reply_records)); @@ -785,13 +765,11 @@ test_gid_parse_ip_pref () gid_address_t _gid_addr, *gid_addr = &_gid_addr; gid_address_t _gid_addr_copy, *copy = &_gid_addr_copy; - /* *INDENT-OFF* */ u8 data[] = { 0x00, 0x01, /* AFI = IPv4 */ 0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (6 == len); @@ -808,14 +786,12 @@ test_gid_parse_mac () gid_address_t _gid, *gid = &_gid; gid_address_t _gid_copy, *gid_copy = &_gid_copy; - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x05, /* AFI = MAC address */ 0x10, 0xbb, 0xcc, 0xdd, /* MAC */ 0x77, 0x99, }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid); _assert (8 == len); @@ -843,7 +819,6 @@ test_gid_write_nsh (void) u16 len = gid_address_put (b, &g); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF*/ @@ -852,7 +827,6 @@ test_gid_write_nsh (void) /* Service Path ID, Service index */ 0x11, 0x22, 0x33, 0x42, /* SPI, SI */ }; - /* *INDENT-ON* */ _assert (sizeof (expected) == len); _assert (0 == memcmp (expected, b, len)); @@ -871,7 +845,6 @@ test_gid_parse_nsh () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (copy, 0, sizeof (copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF*/ @@ -880,7 +853,6 @@ test_gid_parse_nsh () /* Service Path ID, Service index */ 0x55, 0x99, 0x42, 0x09, /* SPI, SI */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (sizeof (data) == len); @@ -907,7 +879,6 @@ test_gid_parse_lcaf () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, /* AFI = LCAF*/ @@ -922,7 +893,6 @@ test_gid_parse_lcaf () 0x00, 0x01, /* AFI = ipv4 */ 0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (18 == len); @@ -951,7 +921,6 @@ test_gid_parse_lcaf_complex () clib_memset (gid_addr, 0, sizeof (gid_addr[0])); clib_memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0])); - /* *INDENT-OFF* */ u8 data[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -988,7 +957,6 @@ test_gid_parse_lcaf_complex () 0x10, 0xbb, 0xcc, 0xdd, 0x10, 0xbb, 0xcc, 0xdd, /* ipv6 address */ }; - /* *INDENT-ON* */ u32 len = gid_address_parse (data, gid_addr); _assert (54 == len); @@ -1056,7 +1024,6 @@ test_write_mac_in_lcaf (void) u16 len = gid_address_put (b, &g); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -1071,7 +1038,6 @@ test_write_mac_in_lcaf (void) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 /* MAC */ }; - /* *INDENT-ON* */ _assert (sizeof (expected) == len); _assert (0 == memcmp (expected, b, len)); @@ -1096,14 +1062,12 @@ test_mac_address_write (void) u16 len = gid_address_put (b, &g); _assert (8 == len); - /* *INDENT-OFF* */ u8 expected[] = { 0x40, 0x05, /* AFI = MAC */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 /* MAC */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected, b, len)); done: @@ -1118,7 +1082,6 @@ test_src_dst_with_vni_serdes (void) u8 *b = clib_mem_alloc (500); clib_memset (b, 0, 500); - /* *INDENT-OFF* */ fid_address_t src = { .type = FID_ADDR_IP_PREF, @@ -1161,7 +1124,6 @@ test_src_dst_with_vni_serdes (void) .vni_mask = 0x9 }; - /* *INDENT-ON* */ u16 size_to_put = gid_address_size_to_put (&g); _assert (36 == size_to_put); @@ -1170,7 +1132,6 @@ test_src_dst_with_vni_serdes (void) u16 write_len = gid_address_put (b, &g); _assert (size_to_put == write_len); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1187,7 +1148,6 @@ test_src_dst_with_vni_serdes (void) 0x00, 0x01, /* AFI = ip4 */ 0x09, 0x08, 0x00, 0x00, /* destination */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b, sizeof (expected_data))); @@ -1205,7 +1165,6 @@ test_src_dst_deser_bad_afi (void) { clib_error_t *error = 0; - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1220,7 +1179,6 @@ test_src_dst_deser_bad_afi (void) 0x10, 0x21, 0x32, 0x43, 0x54, 0x65, /* destination */ }; - /* *INDENT-ON* */ gid_address_t p; _assert (~0 == gid_address_parse (expected_data, &p)); @@ -1265,7 +1223,6 @@ test_src_dst_serdes (void) u16 write_len = gid_address_put (b, &g); _assert (size_to_put == write_len); - /* *INDENT-OFF* */ u8 expected_data[] = { 0x40, 0x03, 0x00, 0x00, /* AFI = LCAF, reserved1, flags */ @@ -1280,7 +1237,6 @@ test_src_dst_serdes (void) 0x10, 0x21, 0x32, 0x43, 0x54, 0x65, /* destination */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_data, b, sizeof (expected_data))); @@ -1320,7 +1276,6 @@ test_gid_address_write (void) u16 write_len = gid_address_put (b, &g); _assert (18 == write_len); - /* *INDENT-OFF* */ u8 expected_gid_data[] = { 0x40, 0x03, /* AFI = LCAF */ @@ -1334,7 +1289,6 @@ test_gid_address_write (void) 0x00, 0x01, /* AFI = IPv4 */ 0xdd, 0xcc, 0xbb, 0xaa, /* ipv4 addr */ }; - /* *INDENT-ON* */ _assert (0 == memcmp (expected_gid_data, b, sizeof (expected_gid_data))); done: @@ -1413,25 +1367,21 @@ done: return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (lisp_cp_command, static) = { .path = "test lisp cp", .short_help = "lisp cp internal unit tests", .function = lisp_cp_test, }; -/* *INDENT-ON* */ #include <vlib/unix/plugin.h> #include <vpp/app/version.h> -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Test Locator ID Separation Protocol (LISP)", .default_disabled = 1, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |