X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fmcast%2Fmcast_test.c;h=be80c9fc982d20e3a89216e4a4ba62da4b59ac81;hb=0bfe5d8c792abcdbcf27bfcc7b7b353fba04aee2;hp=4561d7cdc00074854a38a07e4a58650a4dad1895;hpb=60537f3d83e83d0ce10a620ca99aad4eddf85f5e;p=vpp.git diff --git a/vnet/vnet/mcast/mcast_test.c b/vnet/vnet/mcast/mcast_test.c index 4561d7cdc00..be80c9fc982 100644 --- a/vnet/vnet/mcast/mcast_test.c +++ b/vnet/vnet/mcast/mcast_test.c @@ -40,91 +40,91 @@ mcast_test_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - u8 *rewrite_data; - mcast_test_main_t * mtm = &mcast_test_main; - mcast_main_t * mcm = mtm->mcast_main; - ip_adjacency_t adj; - u32 adj_index; - mcast_group_t * g; - mcast_group_member_t * member; - unformat_input_t _line_input, * line_input = &_line_input; - ip4_address_t dst_addr, zero; - ip4_main_t * im = &ip4_main; - ip_lookup_main_t * lm = &im->lookup_main; - - /* Get a line of input. */ - if (! unformat_user (input, unformat_line_input, line_input)) - return 0; - - pool_get (mcm->groups, g); - memset (g, 0, sizeof (*g)); - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - vnet_hw_interface_t *hw; - u32 next, sw_if_index; - - if (unformat (line_input, "%U", unformat_vnet_sw_interface, - mtm->vnet_main, &sw_if_index)) - { - vec_add2 (g->members, member, 1); - member->tx_sw_if_index = sw_if_index; + /* u8 *rewrite_data; */ + /* mcast_test_main_t * mtm = &mcast_test_main; */ + /* mcast_main_t * mcm = mtm->mcast_main; */ + /* ip_adjacency_t adj; */ + /* u32 adj_index; */ + /* mcast_group_t * g; */ + /* mcast_group_member_t * member; */ + /* unformat_input_t _line_input, * line_input = &_line_input; */ + /* ip4_address_t dst_addr, zero; */ + /* ip4_main_t * im = &ip4_main; */ + /* ip_lookup_main_t * lm = &im->lookup_main; */ + + /* /\* Get a line of input. *\/ */ + /* if (! unformat_user (input, unformat_line_input, line_input)) */ + /* return 0; */ + + /* pool_get (mcm->groups, g); */ + /* memset (g, 0, sizeof (*g)); */ + + /* while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) */ + /* { */ + /* vnet_hw_interface_t *hw; */ + /* u32 next, sw_if_index; */ + + /* if (unformat (line_input, "%U", unformat_vnet_sw_interface, */ + /* mtm->vnet_main, &sw_if_index)) */ + /* { */ + /* vec_add2 (g->members, member, 1); */ + /* member->tx_sw_if_index = sw_if_index; */ - hw = vnet_get_sup_hw_interface (mtm->vnet_main, - sw_if_index); + /* hw = vnet_get_sup_hw_interface (mtm->vnet_main, */ + /* sw_if_index); */ - next = vlib_node_add_next (mtm->vlib_main, - mcast_prep_node.index, - hw->output_node_index); + /* next = vlib_node_add_next (mtm->vlib_main, */ + /* mcast_prep_node.index, */ + /* hw->output_node_index); */ - /* Required to be the same next index... */ - vlib_node_add_next_with_slot (mtm->vlib_main, - mcast_recycle_node.index, - hw->output_node_index, next); - member->prep_and_recycle_node_next_index = next; - } - else - { - return unformat_parse_error (line_input); - } - } - - if (vec_len (g->members) == 0) - { - pool_put (mcm->groups, g); - vlib_cli_output (vm, "no group members specified"); - return 0; - } - - - adj.lookup_next_index = IP_LOOKUP_NEXT_REWRITE; - adj.mcast_group_index = g - mcm->groups; - rewrite_data = format (0, "abcdefg"); - - vnet_rewrite_for_tunnel - (mtm->vnet_main, - (u32)~0, /* tx_sw_if_index, we dont know yet */ - ip4_rewrite_node.index, - mcast_prep_node.index, - &adj.rewrite_header, - rewrite_data, vec_len(rewrite_data)); - - ip_add_adjacency (lm, &adj, 1 /* one adj */, - &adj_index); + /* /\* Required to be the same next index... *\/ */ + /* vlib_node_add_next_with_slot (mtm->vlib_main, */ + /* mcast_recycle_node.index, */ + /* hw->output_node_index, next); */ + /* member->prep_and_recycle_node_next_index = next; */ + /* } */ + /* else */ + /* { */ + /* return unformat_parse_error (line_input); */ + /* } */ + /* } */ + + /* if (vec_len (g->members) == 0) */ + /* { */ + /* pool_put (mcm->groups, g); */ + /* vlib_cli_output (vm, "no group members specified"); */ + /* return 0; */ + /* } */ + + + /* adj.lookup_next_index = IP_LOOKUP_NEXT_REWRITE; */ + /* adj.mcast_group_index = g - mcm->groups; */ + /* rewrite_data = format (0, "abcdefg"); */ + + /* vnet_rewrite_for_tunnel */ + /* (mtm->vnet_main, */ + /* (u32)~0, /\* tx_sw_if_index, we dont know yet *\/ */ + /* ip4_rewrite_node.index, */ + /* mcast_prep_node.index, */ + /* &adj.rewrite_header, */ + /* rewrite_data, vec_len(rewrite_data)); */ + + /* ip_add_adjacency (lm, &adj, 1 /\* one adj *\/, */ + /* &adj_index); */ - dst_addr.as_u32 = clib_host_to_net_u32 (0x0a000002); - zero.as_u32 = 0; - - ip4_add_del_route_next_hop (im, - IP4_ROUTE_FLAG_ADD, - &dst_addr, - 24 /* mask width */, - &zero /* no next hop */, + /* dst_addr.as_u32 = clib_host_to_net_u32 (0x0a000002); */ + /* zero.as_u32 = 0; */ + + /* ip4_add_del_route_next_hop (im, */ + /* IP4_ROUTE_FLAG_ADD, */ + /* &dst_addr, */ + /* 24 /\* mask width *\/, */ + /* &zero /\* no next hop *\/, */ - 0, // next hop sw if index - 1, // weight - adj_index, - 0 /* explicit fib 0 */); + /* 0, // next hop sw if index */ + /* 1, // weight */ + /* adj_index, */ + /* 0 /\* explicit fib 0 *\/); */ return 0; }