X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmap%2Fmap.c;h=6b15ee1919edb9a878f313d74f28ec0d5ec6c607;hb=2500c79423c7d8d35b4e7b8f50060c09f2f857be;hp=8156ec835a8db826ea4504efb221a111c78ede4b;hpb=5a2e278a09726be627b8310e03f0522d60aafedf;p=vpp.git diff --git a/src/plugins/map/map.c b/src/plugins/map/map.c index 8156ec835a8..6b15ee1919e 100644 --- a/src/plugins/map/map.c +++ b/src/plugins/map/map.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -74,30 +73,8 @@ map_create_domain (ip4_address_t * ip4_prefix, { u8 suffix_len, suffix_shift; map_main_t *mm = &map_main; - dpo_id_t dpo_v4 = DPO_INVALID; - dpo_id_t dpo_v6 = DPO_INVALID; map_domain_t *d; - /* Sanity check on the src prefix length */ - if (flags & MAP_DOMAIN_TRANSLATION) - { - if (ip6_src_len != 96 && ip6_src_len != 64) - { - clib_warning ("MAP-T only supports prefix lengths of 64 and 96."); - return -1; - } - } - else - { - if (ip6_src_len != 128) - { - clib_warning - ("MAP-E requires a BR address, not a prefix (ip6_src_len should " - "be 128)."); - return -1; - } - } - /* How many, and which bits to grab from the IPv4 DA */ if (ip4_prefix_len + ea_bits_len < 32) { @@ -145,53 +122,13 @@ map_create_domain (ip4_address_t * ip4_prefix, d->psid_mask = (1 << d->psid_length) - 1; d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length; - /* MAP data-plane object */ - if (d->flags & MAP_DOMAIN_TRANSLATION) - map_t_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4); - else - map_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4); + /* MAP longest match lookup table (input feature / FIB) */ + mm->ip4_prefix_tbl->add (mm->ip4_prefix_tbl, &d->ip4_prefix, + d->ip4_prefix_len, *map_domain_index); - /* Create ip4 route */ - fib_prefix_t pfx = { - .fp_proto = FIB_PROTOCOL_IP4, - .fp_len = d->ip4_prefix_len, - .fp_addr = { - .ip4 = d->ip4_prefix, - } - , - }; - fib_table_entry_special_dpo_add (0, &pfx, - FIB_SOURCE_MAP, - FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v4); - dpo_reset (&dpo_v4); - - /* - * construct a DPO to use the v6 domain - */ - if (d->flags & MAP_DOMAIN_TRANSLATION) - map_t_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6); - else - map_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6); - - /* - * Multiple MAP domains may share same source IPv6 TEP. Which is just dandy. - * We are not tracking the sharing. So a v4 lookup to find the correct - * domain post decap/trnaslate is always done - * - * Create ip6 route. This is a reference counted add. If the prefix - * already exists and is MAP sourced, it is now MAP source n+1 times - * and will need to be removed n+1 times. - */ - fib_prefix_t pfx6 = { - .fp_proto = FIB_PROTOCOL_IP6, - .fp_len = d->ip6_src_len, - .fp_addr.ip6 = d->ip6_src, - }; - - fib_table_entry_special_dpo_add (0, &pfx6, - FIB_SOURCE_MAP, - FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v6); - dpo_reset (&dpo_v6); + /* Really needed? Or always use FIB? */ + mm->ip6_src_prefix_tbl->add (mm->ip6_src_prefix_tbl, &d->ip6_src, + d->ip6_src_len, *map_domain_index); /* Validate packet/byte counters */ map_domain_counter_lock (mm); @@ -231,26 +168,10 @@ map_delete_domain (u32 map_domain_index) } d = pool_elt_at_index (mm->domains, map_domain_index); - - fib_prefix_t pfx = { - .fp_proto = FIB_PROTOCOL_IP4, - .fp_len = d->ip4_prefix_len, - .fp_addr = { - .ip4 = d->ip4_prefix, - } - , - }; - fib_table_entry_special_remove (0, &pfx, FIB_SOURCE_MAP); - - fib_prefix_t pfx6 = { - .fp_proto = FIB_PROTOCOL_IP6, - .fp_len = d->ip6_src_len, - .fp_addr = { - .ip6 = d->ip6_src, - } - , - }; - fib_table_entry_special_remove (0, &pfx6, FIB_SOURCE_MAP); + mm->ip4_prefix_tbl->delete (mm->ip4_prefix_tbl, &d->ip4_prefix, + d->ip4_prefix_len); + mm->ip6_src_prefix_tbl->delete (mm->ip6_src_prefix_tbl, &d->ip6_src, + d->ip6_src_len); /* Deleting rules */ if (d->rules) @@ -263,7 +184,7 @@ map_delete_domain (u32 map_domain_index) int map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep, - u8 is_add) + bool is_add) { map_domain_t *d; map_main_t *mm = &map_main; @@ -441,7 +362,7 @@ map_fib_unresolve (map_main_pre_resolved_t * pr, } void -map_pre_resolve (ip4_address_t * ip4, ip6_address_t * ip6, int is_del) +map_pre_resolve (ip4_address_t * ip4, ip6_address_t * ip6, bool is_del) { if (ip6 && (ip6->as_u64[0] != 0 || ip6->as_u64[1] != 0)) { @@ -587,10 +508,6 @@ map_add_domain_command_fn (vlib_main_t * vm, num_m_args++; else if (unformat (line_input, "mtu %d", &mtu)) num_m_args++; - else if (unformat (line_input, "map-t")) - flags |= MAP_DOMAIN_TRANSLATION; - else if (unformat (line_input, "rfc6052")) - flags |= (MAP_DOMAIN_TRANSLATION | MAP_DOMAIN_RFC6052); else { error = clib_error_return (0, "unknown input `%U'", @@ -714,7 +631,7 @@ map_pre_resolve_command_fn (vlib_main_t * vm, ip4_address_t ip4nh, *p_v4 = NULL; ip6_address_t ip6nh, *p_v6 = NULL; clib_error_t *error = NULL; - int is_del = 0; + bool is_del = false; clib_memset (&ip4nh, 0, sizeof (ip4nh)); clib_memset (&ip6nh, 0, sizeof (ip6nh)); @@ -731,7 +648,7 @@ map_pre_resolve_command_fn (vlib_main_t * vm, if (unformat (line_input, "ip6-nh %U", unformat_ip6_address, &ip6nh)) p_v6 = &ip6nh; else if (unformat (line_input, "del")) - is_del = 1; + is_del = true; else { error = clib_error_return (0, "unknown input `%U'", @@ -938,12 +855,8 @@ done: static char * map_flags_to_string (u32 flags) { - if (flags & MAP_DOMAIN_RFC6052) - return "rfc6052"; if (flags & MAP_DOMAIN_PREFIX) return "prefix"; - if (flags & MAP_DOMAIN_TRANSLATION) - return "map-t"; return ""; } @@ -1070,9 +983,10 @@ show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input, if (map_domain_index == ~0) { - /* *INDENT-OFF* */ - pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_map_domain, d, counters);})); - /* *INDENT-ON* */ + /* *INDENT-OFF* */ + pool_foreach(d, mm->domains, + ({vlib_cli_output(vm, "%U", format_map_domain, d, counters);})); + /* *INDENT-ON* */ } else { @@ -1169,6 +1083,9 @@ show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input, else vlib_cli_output (vm, "MAP traffic-class: %x", mm->tc); + if (mm->tcp_mss) + vlib_cli_output (vm, "MAP TCP MSS clamping: %u", mm->tcp_mss); + vlib_cli_output (vm, "MAP IPv6 inbound security check: %s, fragmented packet security check: %s", mm->sec_check ? "enabled" : "disabled", @@ -1329,6 +1246,56 @@ map_params_reass_command_fn (vlib_main_t * vm, unformat_input_t * input, } +static clib_error_t * +map_if_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + clib_error_t *error = NULL; + bool is_enable = true, is_translation = false; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ~0; + + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (line_input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index)) + ; + else if (unformat (line_input, "del")) + is_enable = false; + else if (unformat (line_input, "map-t")) + is_translation = true; + else + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + goto done; + } + } + +done: + unformat_free (line_input); + + if (sw_if_index == ~0) + { + error = clib_error_return (0, "unknown interface"); + return error; + } + + int rv = map_if_enable_disable (is_enable, sw_if_index, is_translation); + if (rv) + { + error = clib_error_return (0, "failure enabling MAP on interface"); + } + + return error; +} + + /* * packet trace format function */ @@ -1913,6 +1880,45 @@ map_ip6_reass_conf_buffers (u32 buffers) return 0; } +static clib_error_t * +map_tcp_mss_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + clib_error_t *error = NULL; + u32 tcp_mss = 0; + + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "%u", &tcp_mss)) + ; + else + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + goto done; + } + } + + if (tcp_mss >= (0x1 << 16)) + { + error = clib_error_return (0, "invalid value `%u'", tcp_mss); + goto done; + } + + map_param_set_tcp (tcp_mss); + +done: + unformat_free (line_input); + + return error; +} + + /* *INDENT-OFF* */ /*? @@ -1948,6 +1954,22 @@ VLIB_CLI_COMMAND(map_traffic_class_command, static) = { .function = map_traffic_class_command_fn, }; +/*? + * TCP MSS clamping + * + * @cliexpar + * @cliexstart{map params tcp-mss} + * + * This command is used to set the TCP MSS in translated + * or encapsulated packets. + * @cliexend + ?*/ +VLIB_CLI_COMMAND(map_tcp_mss_command, static) = { + .path = "map params tcp-mss", + .short_help = "map params tcp-mss ", + .function = map_tcp_mss_command_fn, +}; + /*? * Bypass IP4/IP6 lookup * @@ -2124,6 +2146,16 @@ VLIB_CLI_COMMAND(show_map_fragments_command, static) = { .function = show_map_fragments_command_fn, }; +/*? + * Enable MAP processing on interface (input feature) + * + ?*/ +VLIB_CLI_COMMAND(map_if_command, static) = { + .path = "map interface", + .short_help = "map interface [map-t] [del]", + .function = map_if_command_fn, +}; + VLIB_PLUGIN_REGISTER() = { .version = VPP_BUILD_VER, .description = "Mapping of address and port (MAP)", @@ -2139,6 +2171,9 @@ map_init (vlib_main_t * vm) { map_main_t *mm = &map_main; clib_error_t *error = 0; + + memset (mm, 0, sizeof (*mm)); + mm->vnet_main = vnet_get_main (); mm->vlib_main = vm; @@ -2172,6 +2207,7 @@ map_init (vlib_main_t * vm) vlib_validate_simple_counter (&mm->icmp_relayed, 0); vlib_zero_simple_counter (&mm->icmp_relayed, 0); + mm->icmp_relayed.stat_segment_name = "/map/icmp-relayed"; /* IP4 virtual reassembly */ mm->ip4_reass_hash_table = 0; @@ -2208,7 +2244,20 @@ map_init (vlib_main_t * vm) #ifdef MAP_SKIP_IP6_LOOKUP fib_node_register_type (FIB_NODE_TYPE_MAP_E, &map_vft); #endif - map_dpo_module_init (); + + /* Create empty domain that's used in case of error */ + map_domain_t *d; + pool_get_aligned (mm->domains, d, CLIB_CACHE_LINE_BYTES); + memset (d, 0, sizeof (*d)); + d->ip6_src_len = 64; + + /* LPM lookup tables */ + mm->ip4_prefix_tbl = lpm_table_init (LPM_TYPE_KEY32); + mm->ip6_prefix_tbl = lpm_table_init (LPM_TYPE_KEY128); + mm->ip6_src_prefix_tbl = lpm_table_init (LPM_TYPE_KEY128); + + mm->bm_trans_enabled_by_sw_if = 0; + mm->bm_encap_enabled_by_sw_if = 0; error = map_plugin_api_hookup (vm);