X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat44-ed%2Fnat44_ed_api.c;h=e9c11c0ea5b960f1c78bf01ecd5f3c82da966007;hb=f059a3452;hp=ea812da9633dd35dd21df4b56138efea62d21ce1;hpb=0eaf4e6784efb2d058fe2f031578251b6bcc0aa8;p=vpp.git diff --git a/src/plugins/nat/nat44-ed/nat44_ed_api.c b/src/plugins/nat/nat44-ed/nat44_ed_api.c index ea812da9633..e9c11c0ea5b 100644 --- a/src/plugins/nat/nat44-ed/nat44_ed_api.c +++ b/src/plugins/nat/nat44-ed/nat44_ed_api.c @@ -34,104 +34,66 @@ #define REPLY_MSG_ID_BASE sm->msg_id_base #include +/* New API calls */ + static void -vl_api_nat_control_ping_t_handler (vl_api_nat_control_ping_t * mp) +vl_api_nat44_ed_plugin_enable_disable_t_handler ( + vl_api_nat44_ed_plugin_enable_disable_t *mp) { - vl_api_nat_control_ping_reply_t *rmp; snat_main_t *sm = &snat_main; + nat44_config_t c = { 0 }; + vl_api_nat44_ed_plugin_enable_disable_reply_t *rmp; int rv = 0; - REPLY_MACRO2 (VL_API_NAT_CONTROL_PING_REPLY, - ({ - rmp->vpe_pid = ntohl (getpid ()); - })); -} + if (mp->enable) + { + c.static_mapping_only = mp->flags & NAT44_API_IS_STATIC_MAPPING_ONLY; + c.connection_tracking = mp->flags & NAT44_API_IS_CONNECTION_TRACKING; -static void -vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t * mp) -{ - vl_api_nat_show_config_reply_t *rmp; - snat_main_t *sm = &snat_main; - int rv = 0; + c.inside_vrf = ntohl (mp->inside_vrf); + c.outside_vrf = ntohl (mp->outside_vrf); - REPLY_MACRO2_ZERO (VL_API_NAT_SHOW_CONFIG_REPLY, - ({ - rmp->translation_buckets = htonl (sm->translation_buckets); - rmp->user_buckets = 0; - rmp->max_translations_per_user = 0; - rmp->outside_vrf_id = htonl (sm->outside_vrf_id); - rmp->inside_vrf_id = htonl (sm->inside_vrf_id); - rmp->static_mapping_only = sm->static_mapping_only; - rmp->static_mapping_connection_tracking = - sm->static_mapping_connection_tracking; - rmp->endpoint_dependent = 1; - rmp->out2in_dpo = 0; - })); + c.sessions = ntohl (mp->sessions); + + rv = nat44_plugin_enable (c); + } + else + { + rv = nat44_plugin_disable (); + } + + REPLY_MACRO (VL_API_NAT44_ED_PLUGIN_ENABLE_DISABLE_REPLY); } static void -vl_api_nat_show_config_2_t_handler (vl_api_nat_show_config_2_t * mp) +vl_api_nat44_ed_set_fq_options_t_handler (vl_api_nat44_ed_set_fq_options_t *mp) { - vl_api_nat_show_config_2_reply_t *rmp; snat_main_t *sm = &snat_main; + vl_api_nat44_ed_set_fq_options_reply_t *rmp; int rv = 0; - - REPLY_MACRO2_ZERO (VL_API_NAT_SHOW_CONFIG_2_REPLY, - ({ - rmp->translation_buckets = htonl (sm->translation_buckets); - rmp->user_buckets = 0; - rmp->max_translations_per_user = 0; - rmp->outside_vrf_id = htonl (sm->outside_vrf_id); - rmp->inside_vrf_id = htonl (sm->inside_vrf_id); - rmp->static_mapping_only = sm->static_mapping_only; - rmp->static_mapping_connection_tracking = - sm->static_mapping_connection_tracking; - rmp->endpoint_dependent = 1; - rmp->out2in_dpo = 0; - rmp->max_translations_per_thread = - clib_net_to_host_u32 (sm->max_translations_per_thread); - rmp->max_users_per_thread = 0; - })); + u32 frame_queue_nelts = ntohl (mp->frame_queue_nelts); + rv = nat44_ed_set_frame_queue_nelts (frame_queue_nelts); + REPLY_MACRO (VL_API_NAT44_ED_SET_FQ_OPTIONS_REPLY); } static void -vl_api_nat44_show_running_config_t_handler (vl_api_nat44_show_running_config_t - * mp) +vl_api_nat44_ed_show_fq_options_t_handler ( + vl_api_nat44_ed_show_fq_options_t *mp) { - vl_api_nat44_show_running_config_reply_t *rmp; snat_main_t *sm = &snat_main; - nat44_config_t *rc = &sm->rconfig; + vl_api_nat44_ed_show_fq_options_reply_t *rmp; int rv = 0; - - REPLY_MACRO2_ZERO (VL_API_NAT44_SHOW_RUNNING_CONFIG_REPLY, + /* clang-format off */ + REPLY_MACRO2_ZERO (VL_API_NAT44_ED_SHOW_FQ_OPTIONS_REPLY, ({ - rmp->inside_vrf = htonl (rc->inside_vrf); - rmp->outside_vrf = htonl (rc->outside_vrf); - - rmp->sessions = htonl (rc->sessions); - rmp->translation_buckets = htonl (sm->translation_buckets); - - // OBSOLETE - rmp->users = 0; - rmp->user_buckets = 0; - rmp->user_sessions = 0; - - rmp->timeouts.udp = htonl (sm->timeouts.udp); - rmp->timeouts.tcp_established = htonl (sm->timeouts.tcp.established); - rmp->timeouts.tcp_transitory = htonl (sm->timeouts.tcp.transitory); - rmp->timeouts.icmp = htonl (sm->timeouts.icmp); - - rmp->forwarding_enabled = sm->forwarding_enabled == 1; - // consider how to split functionality between subplugins - rmp->ipfix_logging_enabled = nat_ipfix_logging_enabled (); - rmp->flags |= NAT44_IS_ENDPOINT_DEPENDENT; - if (rc->static_mapping_only) - rmp->flags |= NAT44_IS_STATIC_MAPPING_ONLY; - if (rc->connection_tracking) - rmp->flags |= NAT44_IS_CONNECTION_TRACKING; + rmp->frame_queue_nelts = htonl (sm->frame_queue_nelts); })); + /* clang-format on */ } +/* Old API calls hold back because of deprecation + * nat44_ed replacement should be used */ + static void vl_api_nat_set_workers_t_handler (vl_api_nat_set_workers_t * mp) { @@ -194,15 +156,6 @@ vl_api_nat_worker_dump_t_handler (vl_api_nat_worker_dump_t * mp) } } -static void -vl_api_nat44_session_cleanup_t_handler (vl_api_nat44_session_cleanup_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_session_cleanup_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT44_SESSION_CLEANUP_REPLY); -} - static void vl_api_nat44_set_session_limit_t_handler (vl_api_nat44_set_session_limit_t * mp) @@ -232,43 +185,6 @@ vl_api_nat_set_log_level_t_handler (vl_api_nat_set_log_level_t * mp) REPLY_MACRO (VL_API_NAT_SET_WORKERS_REPLY); } -static void - vl_api_nat44_plugin_enable_disable_t_handler - (vl_api_nat44_plugin_enable_disable_t * mp) -{ - snat_main_t *sm = &snat_main; - nat44_config_t c = { 0 }; - vl_api_nat44_plugin_enable_disable_reply_t *rmp; - int rv = 0; - - if (mp->enable) - { - if (mp->flags & NAT44_API_IS_OUT2IN_DPO || mp->users || - mp->user_sessions) - { - rv = VNET_API_ERROR_UNSUPPORTED; - } - else - { - c.static_mapping_only = mp->flags & NAT44_API_IS_STATIC_MAPPING_ONLY; - c.connection_tracking = mp->flags & NAT44_API_IS_CONNECTION_TRACKING; - - c.inside_vrf = ntohl (mp->inside_vrf); - c.outside_vrf = ntohl (mp->outside_vrf); - - c.sessions = ntohl (mp->sessions); - - rv = nat44_plugin_enable (c); - } - } - else - { - rv = nat44_plugin_disable (); - } - - REPLY_MACRO (VL_API_NAT44_PLUGIN_ENABLE_DISABLE_REPLY); -} - static void vl_api_nat_ipfix_enable_disable_t_handler (vl_api_nat_ipfix_enable_disable_t * mp) @@ -316,26 +232,6 @@ vl_api_nat_get_timeouts_t_handler (vl_api_nat_get_timeouts_t * mp) })) } -static void - vl_api_nat_set_addr_and_port_alloc_alg_t_handler - (vl_api_nat_set_addr_and_port_alloc_alg_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_set_addr_and_port_alloc_alg_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_SET_ADDR_AND_PORT_ALLOC_ALG_REPLY); -} - -static void - vl_api_nat_get_addr_and_port_alloc_alg_t_handler - (vl_api_nat_get_addr_and_port_alloc_alg_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_get_addr_and_port_alloc_alg_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_GET_ADDR_AND_PORT_ALLOC_ALG_REPLY); -} - static void vl_api_nat_set_mss_clamping_t_handler (vl_api_nat_set_mss_clamping_t * mp) { @@ -365,69 +261,6 @@ vl_api_nat_get_mss_clamping_t_handler (vl_api_nat_get_mss_clamping_t * mp) })) } -static void -vl_api_nat_ha_set_listener_t_handler (vl_api_nat_ha_set_listener_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_set_listener_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_SET_LISTENER_REPLY); -} - -static void -vl_api_nat_ha_get_listener_t_handler (vl_api_nat_ha_get_listener_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_get_listener_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_GET_LISTENER_REPLY); -} - -static void -vl_api_nat_ha_set_failover_t_handler (vl_api_nat_ha_set_failover_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_set_failover_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_SET_FAILOVER_REPLY); -} - -static void -vl_api_nat_ha_get_failover_t_handler (vl_api_nat_ha_get_failover_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_get_failover_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_GET_FAILOVER_REPLY); -} - -static void -vl_api_nat_ha_flush_t_handler (vl_api_nat_ha_flush_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_flush_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_FLUSH_REPLY); -} - -static void -vl_api_nat_ha_resync_t_handler (vl_api_nat_ha_resync_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat_ha_resync_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT_HA_RESYNC_REPLY); -} - -static void -vl_api_nat44_del_user_t_handler (vl_api_nat44_del_user_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_del_user_reply_t *rmp; - int rv = VNET_API_ERROR_UNSUPPORTED; - REPLY_MACRO (VL_API_NAT44_DEL_USER_REPLY); -} - static void vl_api_nat44_add_del_address_range_t_handler (vl_api_nat44_add_del_address_range_t * mp) @@ -470,9 +303,13 @@ static void for (i = 0; i < count; i++) { if (is_add) - rv = snat_add_address (sm, &this_addr, vrf_id, twice_nat); + { + rv = nat44_ed_add_address (&this_addr, vrf_id, twice_nat); + } else - rv = snat_del_address (sm, this_addr, 0, twice_nat); + { + rv = nat44_ed_del_address (this_addr, 0, twice_nat); + } if (rv) goto send_reply; @@ -531,22 +368,27 @@ static void vl_api_nat44_interface_add_del_feature_t_handler (vl_api_nat44_interface_add_del_feature_t * mp) { - snat_main_t *sm = &snat_main; vl_api_nat44_interface_add_del_feature_reply_t *rmp; - u32 sw_if_index = ntohl (mp->sw_if_index); - u8 is_del; + snat_main_t *sm = &snat_main; + u32 sw_if_index; + u8 is_inside; int rv = 0; - is_del = !mp->is_add; - VALIDATE_SW_IF_INDEX (mp); - rv = - snat_interface_add_del (sw_if_index, mp->flags & NAT_API_IS_INSIDE, - is_del); + is_inside = mp->flags & NAT_API_IS_INSIDE; + sw_if_index = ntohl (mp->sw_if_index); - BAD_SW_IF_INDEX_LABEL; + if (mp->is_add) + { + rv = nat44_ed_add_interface (sw_if_index, is_inside); + } + else + { + rv = nat44_ed_del_interface (sw_if_index, is_inside); + } + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_FEATURE_REPLY); } @@ -562,9 +404,9 @@ send_nat44_interface_details (snat_interface_t * i, rmp->_vl_msg_id = ntohs (VL_API_NAT44_INTERFACE_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (i->sw_if_index); - if (nat_interface_is_inside (i)) + if (nat44_ed_is_interface_inside (i)) rmp->flags |= NAT_API_IS_INSIDE; - if (nat_interface_is_outside (i)) + if (nat44_ed_is_interface_outside (i)) rmp->flags |= NAT_API_IS_OUTSIDE; rmp->context = context; @@ -593,16 +435,23 @@ static void vl_api_nat44_interface_add_del_output_feature_t_handler (vl_api_nat44_interface_add_del_output_feature_t * mp) { - snat_main_t *sm = &snat_main; vl_api_nat44_interface_add_del_output_feature_reply_t *rmp; - u32 sw_if_index = ntohl (mp->sw_if_index); + snat_main_t *sm = &snat_main; + u32 sw_if_index; int rv = 0; VALIDATE_SW_IF_INDEX (mp); - rv = snat_interface_add_del_output_feature (sw_if_index, - mp->flags & NAT_API_IS_INSIDE, - !mp->is_add); + sw_if_index = ntohl (mp->sw_if_index); + + if (mp->is_add) + { + rv = nat44_ed_add_output_interface (sw_if_index); + } + else + { + rv = nat44_ed_del_output_interface (sw_if_index); + } BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE_REPLY); @@ -623,7 +472,7 @@ send_nat44_interface_output_feature_details (snat_interface_t * i, rmp->sw_if_index = ntohl (i->sw_if_index); rmp->context = context; - if (nat_interface_is_inside (i)) + if (nat44_ed_is_interface_inside (i)) rmp->flags |= NAT_API_IS_INSIDE; vl_api_send_msg (reg, (u8 *) rmp); @@ -651,43 +500,73 @@ static void vl_api_nat44_add_del_static_mapping_t_handler (vl_api_nat44_add_del_static_mapping_t * mp) { - snat_main_t *sm = &snat_main; vl_api_nat44_add_del_static_mapping_reply_t *rmp; - ip4_address_t local_addr, external_addr, pool_addr = { 0 }; - u16 local_port = 0, external_port = 0; - u32 vrf_id, external_sw_if_index; - twice_nat_type_t twice_nat = TWICE_NAT_DISABLED; + + snat_main_t *sm = &snat_main; int rv = 0; - nat_protocol_t proto; + + ip4_address_t l_addr, e_addr, pool_addr = { 0 }; + u32 sw_if_index, flags = 0, vrf_id; + u16 l_port = 0, e_port = 0; + nat_protocol_t proto = 0; u8 *tag = 0; - memcpy (&local_addr.as_u8, mp->local_ip_address, 4); - memcpy (&external_addr.as_u8, mp->external_ip_address, 4); + memcpy (&l_addr.as_u8, mp->local_ip_address, 4); - if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) + if (mp->flags & NAT_API_IS_ADDR_ONLY) { - local_port = mp->local_port; - external_port = mp->external_port; + flags |= NAT_SM_FLAG_ADDR_ONLY; + } + else + { + l_port = mp->local_port; + e_port = mp->external_port; + proto = ip_proto_to_nat_proto (mp->protocol); } - - vrf_id = clib_net_to_host_u32 (mp->vrf_id); - external_sw_if_index = clib_net_to_host_u32 (mp->external_sw_if_index); - proto = ip_proto_to_nat_proto (mp->protocol); if (mp->flags & NAT_API_IS_TWICE_NAT) - twice_nat = TWICE_NAT; - else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) - twice_nat = TWICE_NAT_SELF; - mp->tag[sizeof (mp->tag) - 1] = 0; - tag = format (0, "%s", mp->tag); - vec_terminate_c_string (tag); - - rv = snat_add_static_mapping ( - local_addr, external_addr, local_port, external_port, vrf_id, - mp->flags & NAT_API_IS_ADDR_ONLY, external_sw_if_index, proto, mp->is_add, - twice_nat, mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, 0, pool_addr, 0); - vec_free (tag); + { + flags |= NAT_SM_FLAG_TWICE_NAT; + } + + if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) + { + flags |= NAT_SM_FLAG_SELF_TWICE_NAT; + } + + if (mp->flags & NAT_API_IS_OUT2IN_ONLY) + { + flags |= NAT_SM_FLAG_OUT2IN_ONLY; + } + + sw_if_index = clib_net_to_host_u32 (mp->external_sw_if_index); + if (sw_if_index != ~0) + { + flags |= NAT_SM_FLAG_SWITCH_ADDRESS; + } + else + { + memcpy (&e_addr.as_u8, mp->external_ip_address, 4); + } + + vrf_id = clib_net_to_host_u32 (mp->vrf_id); + if (mp->is_add) + { + mp->tag[sizeof (mp->tag) - 1] = 0; + tag = format (0, "%s", mp->tag); + vec_terminate_c_string (tag); + + rv = nat44_ed_add_static_mapping (l_addr, e_addr, l_port, e_port, proto, + vrf_id, sw_if_index, flags, pool_addr, + tag); + vec_free (tag); + } + else + { + rv = nat44_ed_del_static_mapping (l_addr, e_addr, l_port, e_port, proto, + vrf_id, sw_if_index, flags); + } REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_REPLY); } @@ -695,47 +574,79 @@ static void vl_api_nat44_add_del_static_mapping_v2_t_handler (vl_api_nat44_add_del_static_mapping_v2_t * mp) { - snat_main_t *sm = &snat_main; vl_api_nat44_add_del_static_mapping_v2_reply_t *rmp; - ip4_address_t local_addr, external_addr, pool_addr; - u16 local_port = 0, external_port = 0; - u32 vrf_id, external_sw_if_index; - twice_nat_type_t twice_nat = TWICE_NAT_DISABLED; + + snat_main_t *sm = &snat_main; int rv = 0; + + ip4_address_t l_addr, e_addr, pool_addr; + u32 sw_if_index, flags = 0, vrf_id; + u16 l_port = 0, e_port = 0; nat_protocol_t proto; u8 *tag = 0; + memcpy (&l_addr.as_u8, mp->local_ip_address, 4); memcpy (&pool_addr.as_u8, mp->pool_ip_address, 4); - memcpy (&local_addr.as_u8, mp->local_ip_address, 4); - memcpy (&external_addr.as_u8, mp->external_ip_address, 4); - if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) + if (pool_addr.as_u32 != 0) { - local_port = mp->local_port; - external_port = mp->external_port; + flags |= NAT_SM_FLAG_EXACT_ADDRESS; } - vrf_id = clib_net_to_host_u32 (mp->vrf_id); - external_sw_if_index = clib_net_to_host_u32 (mp->external_sw_if_index); - proto = ip_proto_to_nat_proto (mp->protocol); + if (mp->flags & NAT_API_IS_ADDR_ONLY) + { + flags |= NAT_SM_FLAG_ADDR_ONLY; + } + else + { + l_port = mp->local_port; + e_port = mp->external_port; + } if (mp->flags & NAT_API_IS_TWICE_NAT) - twice_nat = TWICE_NAT; - else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) - twice_nat = TWICE_NAT_SELF; - mp->tag[sizeof (mp->tag) - 1] = 0; - tag = format (0, "%s", mp->tag); - vec_terminate_c_string (tag); - - rv = snat_add_static_mapping (local_addr, external_addr, local_port, - external_port, vrf_id, - mp->flags & NAT_API_IS_ADDR_ONLY, - external_sw_if_index, proto, - mp->is_add, twice_nat, - mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, 0, - pool_addr, mp->match_pool); - vec_free (tag); + { + flags |= NAT_SM_FLAG_TWICE_NAT; + } + + if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) + { + flags |= NAT_SM_FLAG_SELF_TWICE_NAT; + } + + if (mp->flags & NAT_API_IS_OUT2IN_ONLY) + { + flags |= NAT_SM_FLAG_OUT2IN_ONLY; + } + + sw_if_index = clib_net_to_host_u32 (mp->external_sw_if_index); + if (sw_if_index) + { + flags |= NAT_SM_FLAG_SWITCH_ADDRESS; + } + else + { + memcpy (&e_addr.as_u8, mp->external_ip_address, 4); + } + proto = ip_proto_to_nat_proto (mp->protocol); + vrf_id = clib_net_to_host_u32 (mp->vrf_id); + + if (mp->is_add) + { + mp->tag[sizeof (mp->tag) - 1] = 0; + tag = format (0, "%s", mp->tag); + vec_terminate_c_string (tag); + + rv = nat44_ed_add_static_mapping (l_addr, e_addr, l_port, e_port, proto, + vrf_id, sw_if_index, flags, pool_addr, + tag); + vec_free (tag); + } + else + { + rv = nat44_ed_del_static_mapping (l_addr, e_addr, l_port, e_port, proto, + vrf_id, sw_if_index, flags); + } REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_V2_REPLY); } @@ -758,17 +669,26 @@ send_nat44_static_mapping_details (snat_static_mapping_t * m, rmp->vrf_id = htonl (m->vrf_id); rmp->context = context; - if (m->twice_nat == TWICE_NAT) - rmp->flags |= NAT_API_IS_TWICE_NAT; - else if (m->twice_nat == TWICE_NAT_SELF) - rmp->flags |= NAT_API_IS_SELF_TWICE_NAT; + // convert these in new api - if (is_out2in_only_static_mapping (m)) - rmp->flags |= NAT_API_IS_OUT2IN_ONLY; + if (is_sm_self_twice_nat (m->flags)) + { + rmp->flags |= NAT_API_IS_SELF_TWICE_NAT; + } - if (is_addr_only_static_mapping (m)) + if (is_sm_out2in_only (m->flags)) { - rmp->flags |= NAT_API_IS_ADDR_ONLY; + rmp->flags |= NAT_API_IS_OUT2IN_ONLY; + } + + if (is_sm_twice_nat (m->flags)) + { + rmp->flags |= NAT_API_IS_TWICE_NAT; + } + + if (is_sm_addr_only (m->flags)) + { + rmp->flags |= NAT_API_IS_ADDR_ONLY; } else { @@ -835,8 +755,8 @@ vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t pool_foreach (m, sm->static_mappings) { - if (!is_identity_static_mapping(m) && !is_lb_static_mapping (m)) - send_nat44_static_mapping_details (m, reg, mp->context); + if (!is_sm_identity_nat (m->flags) && !is_sm_lb (m->flags)) + send_nat44_static_mapping_details (m, reg, mp->context); } for (j = 0; j < vec_len (sm->to_resolve); j++) @@ -851,36 +771,56 @@ static void vl_api_nat44_add_del_identity_mapping_t_handler (vl_api_nat44_add_del_identity_mapping_t * mp) { - snat_main_t *sm = &snat_main; vl_api_nat44_add_del_identity_mapping_reply_t *rmp; + + snat_main_t *sm = &snat_main; + int rv = 0; + ip4_address_t addr, pool_addr = { 0 }; + u32 sw_if_index, flags, vrf_id; + nat_protocol_t proto = 0; u16 port = 0; - u32 vrf_id, sw_if_index; - int rv = 0; - nat_protocol_t proto = NAT_PROTOCOL_OTHER; u8 *tag = 0; - if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) + flags = NAT_SM_FLAG_IDENTITY_NAT; + + if (mp->flags & NAT_API_IS_ADDR_ONLY) + { + flags |= NAT_SM_FLAG_ADDR_ONLY; + } + else { port = mp->port; proto = ip_proto_to_nat_proto (mp->protocol); } - vrf_id = clib_net_to_host_u32 (mp->vrf_id); + sw_if_index = clib_net_to_host_u32 (mp->sw_if_index); if (sw_if_index != ~0) - addr.as_u32 = 0; + { + flags |= NAT_SM_FLAG_SWITCH_ADDRESS; + } else - memcpy (&addr.as_u8, mp->ip_address, 4); - mp->tag[sizeof (mp->tag) - 1] = 0; - tag = format (0, "%s", mp->tag); - vec_terminate_c_string (tag); - - rv = - snat_add_static_mapping (addr, addr, port, port, vrf_id, - mp->flags & NAT_API_IS_ADDR_ONLY, sw_if_index, - proto, mp->is_add, 0, 0, tag, 1, pool_addr, 0); - vec_free (tag); + { + memcpy (&addr.as_u8, mp->ip_address, 4); + } + vrf_id = clib_net_to_host_u32 (mp->vrf_id); + + if (mp->is_add) + { + mp->tag[sizeof (mp->tag) - 1] = 0; + tag = format (0, "%s", mp->tag); + vec_terminate_c_string (tag); + + rv = nat44_ed_add_static_mapping (addr, addr, port, port, proto, vrf_id, + sw_if_index, flags, pool_addr, tag); + vec_free (tag); + } + else + { + rv = nat44_ed_del_static_mapping (addr, addr, port, port, proto, vrf_id, + sw_if_index, flags); + } REPLY_MACRO (VL_API_NAT44_ADD_DEL_IDENTITY_MAPPING_REPLY); } @@ -897,7 +837,7 @@ send_nat44_identity_mapping_details (snat_static_mapping_t * m, int index, rmp->_vl_msg_id = ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base); - if (is_addr_only_static_mapping (m)) + if (is_sm_addr_only (m->flags)) rmp->flags |= NAT_API_IS_ADDR_ONLY; clib_memcpy (rmp->ip_address, &(m->local_addr), 4); @@ -954,15 +894,15 @@ static void return; pool_foreach (m, sm->static_mappings) - { - if (is_identity_static_mapping(m) && !is_lb_static_mapping (m)) - { - pool_foreach_index (j, m->locals) - { - send_nat44_identity_mapping_details (m, j, reg, mp->context); - } - } - } + { + if (is_sm_identity_nat (m->flags) && !is_sm_lb (m->flags)) + { + pool_foreach_index (j, m->locals) + { + send_nat44_identity_mapping_details (m, j, reg, mp->context); + } + } + } for (j = 0; j < vec_len (sm->to_resolve); j++) { @@ -979,8 +919,8 @@ static void snat_main_t *sm = &snat_main; vl_api_nat44_add_del_interface_addr_reply_t *rmp; u32 sw_if_index = ntohl (mp->sw_if_index); + u8 twice_nat; int rv = 0; - u8 is_del; if (sm->static_mapping_only) { @@ -988,12 +928,18 @@ static void goto send_reply; } - is_del = !mp->is_add; - VALIDATE_SW_IF_INDEX (mp); - rv = snat_add_interface_address (sm, sw_if_index, is_del, - mp->flags & NAT_API_IS_TWICE_NAT); + twice_nat = mp->flags & NAT_API_IS_TWICE_NAT; + + if (mp->is_add) + { + rv = nat44_ed_add_interface_address (sw_if_index, twice_nat); + } + else + { + rv = nat44_ed_del_interface_address (sw_if_index, twice_nat); + } BAD_SW_IF_INDEX_LABEL; @@ -1044,176 +990,631 @@ vl_api_nat44_interface_addr_dump_t_handler (vl_api_nat44_interface_addr_dump_t } } -/* user (internal host) key */ -typedef struct +static nat44_lb_addr_port_t * +unformat_nat44_lb_addr_port (vl_api_nat44_lb_addr_port_t *addr_port_pairs, + u32 addr_port_pair_num) { - union - { - struct - { - ip4_address_t addr; - u32 fib_index; - }; - u64 as_u64; - }; -} snat_user_key_t; + u8 i; + nat44_lb_addr_port_t *lb_addr_port_pairs = 0, lb_addr_port; + vl_api_nat44_lb_addr_port_t *ap; -typedef struct -{ - ip4_address_t addr; - u32 fib_index; - u32 nsessions; - u32 nstaticsessions; -} snat_user_t; + for (i = 0; i < addr_port_pair_num; i++) + { + ap = &addr_port_pairs[i]; + clib_memset (&lb_addr_port, 0, sizeof (lb_addr_port)); + clib_memcpy (&lb_addr_port.addr, ap->addr, 4); + lb_addr_port.port = ap->port; + lb_addr_port.probability = ap->probability; + lb_addr_port.vrf_id = clib_net_to_host_u32 (ap->vrf_id); + vec_add1 (lb_addr_port_pairs, lb_addr_port); + } -typedef struct -{ - u32 user_buckets; - snat_user_t *users; - clib_bihash_8_8_t user_hash; -} user_create_helper_t; + return lb_addr_port_pairs; +} static void -send_nat44_user_details (snat_user_t * u, vl_api_registration_t * reg, - u32 context) +vl_api_nat44_add_del_lb_static_mapping_t_handler ( + vl_api_nat44_add_del_lb_static_mapping_t *mp) { - vl_api_nat44_user_details_t *rmp; snat_main_t *sm = &snat_main; - ip4_main_t *im = &ip4_main; + vl_api_nat44_add_del_lb_static_mapping_reply_t *rmp; + nat44_lb_addr_port_t *locals = 0; + ip4_address_t e_addr; + nat_protocol_t proto; + u32 flags = 0; + u8 *tag = 0; + int rv = 0; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_NAT44_USER_DETAILS + sm->msg_id_base); + locals = unformat_nat44_lb_addr_port (mp->locals, + clib_net_to_host_u32 (mp->local_num)); + clib_memcpy (&e_addr, mp->external_addr, 4); + proto = ip_proto_to_nat_proto (mp->protocol); - if (!pool_is_free_index (im->fibs, u->fib_index)) + if (mp->flags & NAT_API_IS_TWICE_NAT) { - fib_table_t *fib = fib_table_get (u->fib_index, FIB_PROTOCOL_IP4); - rmp->vrf_id = ntohl (fib->ft_table_id); + flags |= NAT_SM_FLAG_TWICE_NAT; } - - clib_memcpy (rmp->ip_address, &(u->addr), 4); - rmp->nsessions = ntohl (u->nsessions); - rmp->nstaticsessions = ntohl (u->nstaticsessions); - rmp->context = context; - - vl_api_send_msg (reg, (u8 *) rmp); -} - -static void -nat_ed_user_create_helper (user_create_helper_t *uch, snat_session_t *s) -{ - snat_user_key_t k; - k.addr = s->in2out.addr; - k.fib_index = s->in2out.fib_index; - clib_bihash_kv_8_8_t key, value; - key.key = k.as_u64; - snat_user_t *u; - - if (clib_bihash_search_8_8 (&uch->user_hash, &key, &value)) + else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) { - pool_get (uch->users, u); - u->addr = k.addr; - u->fib_index = k.fib_index; - u->nsessions = 0; - u->nstaticsessions = 0; - key.value = u - uch->users; - clib_bihash_add_del_8_8 (&uch->user_hash, &key, 1); + flags |= NAT_SM_FLAG_SELF_TWICE_NAT; } - else + + if (mp->flags & NAT_API_IS_OUT2IN_ONLY) { - u = pool_elt_at_index (uch->users, value.value); + flags |= NAT_SM_FLAG_OUT2IN_ONLY; } - if (snat_is_session_static (s)) + + if (mp->is_add) { - ++u->nstaticsessions; + mp->tag[sizeof (mp->tag) - 1] = 0; + tag = format (0, "%s", mp->tag); + vec_terminate_c_string (tag); + + rv = nat44_ed_add_lb_static_mapping ( + e_addr, mp->external_port, proto, locals, flags, tag, + clib_net_to_host_u32 (mp->affinity)); } else { - ++u->nsessions; + rv = nat44_ed_del_lb_static_mapping (e_addr, mp->external_port, proto, + flags); } + + vec_free (locals); + vec_free (tag); + REPLY_MACRO (VL_API_NAT44_ADD_DEL_LB_STATIC_MAPPING_REPLY); } -u8 * -format_user_kvp (u8 *s, va_list *args) +static void +vl_api_nat44_lb_static_mapping_add_del_local_t_handler ( + vl_api_nat44_lb_static_mapping_add_del_local_t *mp) { - clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *); - snat_user_key_t k; - k.as_u64 = v->key; - s = format (s, "%U fib %d user-index %llu", format_ip4_address, &k.addr, - k.fib_index, v->value); - return s; + snat_main_t *sm = &snat_main; + vl_api_nat44_lb_static_mapping_add_del_local_reply_t *rmp; + int rv = 0; + ip4_address_t e_addr, l_addr; + nat_protocol_t proto; + + clib_memcpy (&e_addr, mp->external_addr, 4); + clib_memcpy (&l_addr, mp->local.addr, 4); + proto = ip_proto_to_nat_proto (mp->protocol); + + rv = nat44_ed_add_del_lb_static_mapping_local ( + e_addr, mp->external_port, l_addr, mp->local.port, proto, + clib_net_to_host_u32 (mp->local.vrf_id), mp->local.probability, + mp->is_add); + + REPLY_MACRO (VL_API_NAT44_LB_STATIC_MAPPING_ADD_DEL_LOCAL_REPLY); } static void -nat_ed_users_create (snat_main_per_thread_data_t *tsm, - user_create_helper_t *uch) +send_nat44_lb_static_mapping_details (snat_static_mapping_t *m, + vl_api_registration_t *reg, u32 context) { - snat_session_t *s; - clib_bihash_init_8_8 (&uch->user_hash, "users", uch->user_buckets, 0); - clib_bihash_set_kvp_format_fn_8_8 (&uch->user_hash, format_user_kvp); - pool_foreach (s, tsm->sessions) + vl_api_nat44_lb_static_mapping_details_t *rmp; + snat_main_t *sm = &snat_main; + nat44_lb_addr_port_t *ap; + vl_api_nat44_lb_addr_port_t *locals; + u32 local_num = 0; + + rmp = vl_msg_api_alloc ( + sizeof (*rmp) + (pool_elts (m->locals) * sizeof (nat44_lb_addr_port_t))); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = + ntohs (VL_API_NAT44_LB_STATIC_MAPPING_DETAILS + sm->msg_id_base); + + clib_memcpy (rmp->external_addr, &(m->external_addr), 4); + rmp->external_port = m->external_port; + rmp->protocol = nat_proto_to_ip_proto (m->proto); + rmp->context = context; + + if (is_sm_self_twice_nat (m->flags)) { - nat_ed_user_create_helper (uch, s); + rmp->flags |= NAT_API_IS_SELF_TWICE_NAT; } -} -static void -nat_ed_users_destroy (user_create_helper_t *uch) -{ - pool_free (uch->users); - clib_bihash_free_8_8 (&uch->user_hash); + if (is_sm_out2in_only (m->flags)) + { + rmp->flags |= NAT_API_IS_OUT2IN_ONLY; + } + + if (is_sm_twice_nat (m->flags)) + { + rmp->flags |= NAT_API_IS_TWICE_NAT; + } + + if (m->tag) + strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag)); + + locals = (vl_api_nat44_lb_addr_port_t *) rmp->locals; + pool_foreach (ap, m->locals) + { + clib_memcpy (locals->addr, &(ap->addr), 4); + locals->port = ap->port; + locals->probability = ap->probability; + locals->vrf_id = ntohl (ap->vrf_id); + locals++; + local_num++; + } + rmp->local_num = ntohl (local_num); + + vl_api_send_msg (reg, (u8 *) rmp); } static void -vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp) +vl_api_nat44_lb_static_mapping_dump_t_handler ( + vl_api_nat44_lb_static_mapping_dump_t *mp) { - user_create_helper_t uch; vl_api_registration_t *reg; snat_main_t *sm = &snat_main; - snat_main_per_thread_data_t *tsm; - snat_user_t *u; - - clib_memset (&uch, 0, sizeof (uch)); - - uch.user_buckets = nat_calc_bihash_buckets (1024); + snat_static_mapping_t *m; reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) return; - vec_foreach (tsm, sm->per_thread_data) + pool_foreach (m, sm->static_mappings) { - nat_ed_users_create (tsm, &uch); - pool_foreach (u, uch.users) - { - send_nat44_user_details (u, reg, mp->context); - } - nat_ed_users_destroy (&uch); + if (is_sm_lb (m->flags)) + send_nat44_lb_static_mapping_details (m, reg, mp->context); } } static void -send_nat44_user_session_details (snat_session_t * s, - vl_api_registration_t * reg, u32 context) +vl_api_nat44_del_session_t_handler (vl_api_nat44_del_session_t *mp) { - vl_api_nat44_user_session_details_t *rmp; snat_main_t *sm = &snat_main; + vl_api_nat44_del_session_reply_t *rmp; + ip4_address_t addr, eh_addr; + u16 port, eh_port; + u32 vrf_id; + int rv = 0; + u8 is_in; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = - ntohs (VL_API_NAT44_USER_SESSION_DETAILS + sm->msg_id_base); - clib_memcpy (rmp->outside_ip_address, (&s->out2in.addr), 4); - clib_memcpy (rmp->inside_ip_address, (&s->in2out.addr), 4); + memcpy (&addr.as_u8, mp->address, 4); + port = mp->port; + vrf_id = clib_net_to_host_u32 (mp->vrf_id); + memcpy (&eh_addr.as_u8, mp->ext_host_address, 4); + eh_port = mp->ext_host_port; - if (snat_is_session_static (s)) - rmp->flags |= NAT_API_IS_STATIC; + is_in = mp->flags & NAT_API_IS_INSIDE; - if (is_twice_nat_session (s)) - rmp->flags |= NAT_API_IS_TWICE_NAT; + rv = nat44_ed_del_session (sm, &addr, port, &eh_addr, eh_port, mp->protocol, + vrf_id, is_in); - if (is_ed_session (s) || is_fwd_bypass_session (s)) - rmp->flags |= NAT_API_IS_EXT_HOST_VALID; + REPLY_MACRO (VL_API_NAT44_DEL_SESSION_REPLY); +} + +static void +vl_api_nat44_forwarding_enable_disable_t_handler ( + vl_api_nat44_forwarding_enable_disable_t *mp) +{ + vl_api_nat44_forwarding_enable_disable_reply_t *rmp; + snat_main_t *sm = &snat_main; + int rv = 0; + nat44_ed_forwarding_enable_disable (mp->enable); + REPLY_MACRO (VL_API_NAT44_FORWARDING_ENABLE_DISABLE_REPLY); +} + +static void +vl_api_nat44_forwarding_is_enabled_t_handler ( + vl_api_nat44_forwarding_is_enabled_t *mp) +{ + vl_api_registration_t *reg; + snat_main_t *sm = &snat_main; + vl_api_nat44_forwarding_is_enabled_reply_t *rmp; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = + ntohs (VL_API_NAT44_FORWARDING_IS_ENABLED_REPLY + sm->msg_id_base); + rmp->context = mp->context; + + rmp->enabled = sm->forwarding_enabled; + + vl_api_send_msg (reg, (u8 *) rmp); +} + +/* Obsolete calls hold back because of deprecation + * should not be used */ + +static void +vl_api_nat_set_addr_and_port_alloc_alg_t_handler ( + vl_api_nat_set_addr_and_port_alloc_alg_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_set_addr_and_port_alloc_alg_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_SET_ADDR_AND_PORT_ALLOC_ALG_REPLY); +} + +static void +vl_api_nat_get_addr_and_port_alloc_alg_t_handler ( + vl_api_nat_get_addr_and_port_alloc_alg_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_get_addr_and_port_alloc_alg_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_GET_ADDR_AND_PORT_ALLOC_ALG_REPLY); +} + +static void +vl_api_nat_ha_set_listener_t_handler (vl_api_nat_ha_set_listener_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_set_listener_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_SET_LISTENER_REPLY); +} + +static void +vl_api_nat_ha_get_listener_t_handler (vl_api_nat_ha_get_listener_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_get_listener_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_GET_LISTENER_REPLY); +} + +static void +vl_api_nat_ha_set_failover_t_handler (vl_api_nat_ha_set_failover_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_set_failover_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_SET_FAILOVER_REPLY); +} + +static void +vl_api_nat_ha_get_failover_t_handler (vl_api_nat_ha_get_failover_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_get_failover_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_GET_FAILOVER_REPLY); +} + +static void +vl_api_nat_ha_flush_t_handler (vl_api_nat_ha_flush_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_flush_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_FLUSH_REPLY); +} + +static void +vl_api_nat_ha_resync_t_handler (vl_api_nat_ha_resync_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat_ha_resync_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT_HA_RESYNC_REPLY); +} + +static void +vl_api_nat44_del_user_t_handler (vl_api_nat44_del_user_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat44_del_user_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT44_DEL_USER_REPLY); +} + +static void +vl_api_nat44_session_cleanup_t_handler (vl_api_nat44_session_cleanup_t *mp) +{ + snat_main_t *sm = &snat_main; + vl_api_nat44_session_cleanup_reply_t *rmp; + int rv = VNET_API_ERROR_UNSUPPORTED; + REPLY_MACRO (VL_API_NAT44_SESSION_CLEANUP_REPLY); +} + +static void +vl_api_nat44_plugin_enable_disable_t_handler ( + vl_api_nat44_plugin_enable_disable_t *mp) +{ + snat_main_t *sm = &snat_main; + nat44_config_t c = { 0 }; + vl_api_nat44_plugin_enable_disable_reply_t *rmp; + int rv = 0; + + if (mp->enable) + { + if (mp->users || mp->user_sessions) + { + rv = VNET_API_ERROR_UNSUPPORTED; + } + else + { + c.static_mapping_only = mp->flags & NAT44_API_IS_STATIC_MAPPING_ONLY; + c.connection_tracking = mp->flags & NAT44_API_IS_CONNECTION_TRACKING; + + c.inside_vrf = ntohl (mp->inside_vrf); + c.outside_vrf = ntohl (mp->outside_vrf); + + c.sessions = ntohl (mp->sessions); + + rv = nat44_plugin_enable (c); + } + } + else + { + rv = nat44_plugin_disable (); + } + + REPLY_MACRO (VL_API_NAT44_PLUGIN_ENABLE_DISABLE_REPLY); +} + +static void +vl_api_nat_control_ping_t_handler (vl_api_nat_control_ping_t *mp) +{ + vl_api_nat_control_ping_reply_t *rmp; + snat_main_t *sm = &snat_main; + int rv = 0; + + REPLY_MACRO2 (VL_API_NAT_CONTROL_PING_REPLY, + ({ rmp->vpe_pid = ntohl (getpid ()); })); +} + +static void +vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t *mp) +{ + vl_api_nat_show_config_reply_t *rmp; + snat_main_t *sm = &snat_main; + int rv = 0; + + REPLY_MACRO2_ZERO (VL_API_NAT_SHOW_CONFIG_REPLY, ({ + rmp->translation_buckets = + htonl (sm->translation_buckets); + rmp->user_buckets = 0; + rmp->max_translations_per_user = 0; + rmp->outside_vrf_id = htonl (sm->outside_vrf_id); + rmp->inside_vrf_id = htonl (sm->inside_vrf_id); + rmp->static_mapping_only = sm->static_mapping_only; + rmp->static_mapping_connection_tracking = + sm->static_mapping_connection_tracking; + rmp->endpoint_dependent = 1; + rmp->out2in_dpo = 0; + })); +} + +static void +vl_api_nat_show_config_2_t_handler (vl_api_nat_show_config_2_t *mp) +{ + vl_api_nat_show_config_2_reply_t *rmp; + snat_main_t *sm = &snat_main; + int rv = 0; + + REPLY_MACRO2_ZERO ( + VL_API_NAT_SHOW_CONFIG_2_REPLY, ({ + rmp->translation_buckets = htonl (sm->translation_buckets); + rmp->user_buckets = 0; + rmp->max_translations_per_user = 0; + rmp->outside_vrf_id = htonl (sm->outside_vrf_id); + rmp->inside_vrf_id = htonl (sm->inside_vrf_id); + rmp->static_mapping_only = sm->static_mapping_only; + rmp->static_mapping_connection_tracking = + sm->static_mapping_connection_tracking; + rmp->endpoint_dependent = 1; + rmp->out2in_dpo = 0; + rmp->max_translations_per_thread = + clib_net_to_host_u32 (sm->max_translations_per_thread); + rmp->max_users_per_thread = 0; + })); +} + +static void +vl_api_nat44_show_running_config_t_handler ( + vl_api_nat44_show_running_config_t *mp) +{ + vl_api_nat44_show_running_config_reply_t *rmp; + snat_main_t *sm = &snat_main; + nat44_config_t *rc = &sm->rconfig; + int rv = 0; + + REPLY_MACRO2_ZERO ( + VL_API_NAT44_SHOW_RUNNING_CONFIG_REPLY, ({ + rmp->inside_vrf = htonl (rc->inside_vrf); + rmp->outside_vrf = htonl (rc->outside_vrf); + + rmp->sessions = htonl (rc->sessions); + rmp->translation_buckets = htonl (sm->translation_buckets); + + // OBSOLETE + rmp->users = 0; + rmp->user_buckets = 0; + rmp->user_sessions = 0; + + rmp->timeouts.udp = htonl (sm->timeouts.udp); + rmp->timeouts.tcp_established = htonl (sm->timeouts.tcp.established); + rmp->timeouts.tcp_transitory = htonl (sm->timeouts.tcp.transitory); + rmp->timeouts.icmp = htonl (sm->timeouts.icmp); + + rmp->forwarding_enabled = sm->forwarding_enabled == 1; + // consider how to split functionality between subplugins + rmp->ipfix_logging_enabled = nat_ipfix_logging_enabled (); + rmp->flags |= NAT44_IS_ENDPOINT_DEPENDENT; + if (rc->static_mapping_only) + rmp->flags |= NAT44_IS_STATIC_MAPPING_ONLY; + if (rc->connection_tracking) + rmp->flags |= NAT44_IS_CONNECTION_TRACKING; + })); +} + +/* user (internal host) key */ +typedef struct +{ + union + { + struct + { + ip4_address_t addr; + u32 fib_index; + }; + u64 as_u64; + }; +} snat_user_key_t; + +typedef struct +{ + ip4_address_t addr; + u32 fib_index; + u32 nsessions; + u32 nstaticsessions; +} snat_user_t; + +typedef struct +{ + u32 user_buckets; + snat_user_t *users; + clib_bihash_8_8_t user_hash; +} user_create_helper_t; + +static void +send_nat44_user_details (snat_user_t *u, vl_api_registration_t *reg, + u32 context) +{ + vl_api_nat44_user_details_t *rmp; + snat_main_t *sm = &snat_main; + ip4_main_t *im = &ip4_main; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs (VL_API_NAT44_USER_DETAILS + sm->msg_id_base); + + if (!pool_is_free_index (im->fibs, u->fib_index)) + { + fib_table_t *fib = fib_table_get (u->fib_index, FIB_PROTOCOL_IP4); + rmp->vrf_id = ntohl (fib->ft_table_id); + } + + clib_memcpy (rmp->ip_address, &(u->addr), 4); + rmp->nsessions = ntohl (u->nsessions); + rmp->nstaticsessions = ntohl (u->nstaticsessions); + rmp->context = context; + + vl_api_send_msg (reg, (u8 *) rmp); +} + +static void +nat_ed_user_create_helper (user_create_helper_t *uch, snat_session_t *s) +{ + snat_user_key_t k; + k.addr = s->in2out.addr; + k.fib_index = s->in2out.fib_index; + clib_bihash_kv_8_8_t key, value; + key.key = k.as_u64; + snat_user_t *u; + + if (clib_bihash_search_8_8 (&uch->user_hash, &key, &value)) + { + pool_get (uch->users, u); + u->addr = k.addr; + u->fib_index = k.fib_index; + u->nsessions = 0; + u->nstaticsessions = 0; + key.value = u - uch->users; + clib_bihash_add_del_8_8 (&uch->user_hash, &key, 1); + } + else + { + u = pool_elt_at_index (uch->users, value.value); + } + if (nat44_ed_is_session_static (s)) + { + ++u->nstaticsessions; + } + else + { + ++u->nsessions; + } +} + +u8 * +format_user_kvp (u8 *s, va_list *args) +{ + clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *); + snat_user_key_t k; + k.as_u64 = v->key; + s = format (s, "%U fib %d user-index %llu", format_ip4_address, &k.addr, + k.fib_index, v->value); + return s; +} + +static void +nat_ed_users_create (snat_main_per_thread_data_t *tsm, + user_create_helper_t *uch) +{ + snat_session_t *s; + clib_bihash_init_8_8 (&uch->user_hash, "users", uch->user_buckets, 0); + clib_bihash_set_kvp_format_fn_8_8 (&uch->user_hash, format_user_kvp); + pool_foreach (s, tsm->sessions) + { + nat_ed_user_create_helper (uch, s); + } +} + +static void +nat_ed_users_destroy (user_create_helper_t *uch) +{ + pool_free (uch->users); + clib_bihash_free_8_8 (&uch->user_hash); +} + +static void +vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp) +{ + user_create_helper_t uch; + vl_api_registration_t *reg; + snat_main_t *sm = &snat_main; + snat_main_per_thread_data_t *tsm; + snat_user_t *u; + + clib_memset (&uch, 0, sizeof (uch)); + + uch.user_buckets = nat_calc_bihash_buckets (1024); + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + vec_foreach (tsm, sm->per_thread_data) + { + nat_ed_users_create (tsm, &uch); + pool_foreach (u, uch.users) + { + send_nat44_user_details (u, reg, mp->context); + } + nat_ed_users_destroy (&uch); + } +} + +static void +send_nat44_user_session_details (snat_session_t * s, + vl_api_registration_t * reg, u32 context) +{ + vl_api_nat44_user_session_details_t *rmp; + snat_main_t *sm = &snat_main; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = + ntohs (VL_API_NAT44_USER_SESSION_DETAILS + sm->msg_id_base); + clib_memcpy (rmp->outside_ip_address, (&s->out2in.addr), 4); + clib_memcpy (rmp->inside_ip_address, (&s->in2out.addr), 4); + + if (nat44_ed_is_session_static (s)) + rmp->flags |= NAT_API_IS_STATIC; + + if (nat44_ed_is_twice_nat_session (s)) + rmp->flags |= NAT_API_IS_TWICE_NAT; + + rmp->flags |= NAT_API_IS_EXT_HOST_VALID; rmp->last_heard = clib_host_to_net_u64 ((u64) s->last_heard); rmp->total_bytes = clib_host_to_net_u64 (s->total_bytes); @@ -1231,16 +1632,13 @@ send_nat44_user_session_details (snat_session_t * s, rmp->inside_port = s->in2out.port; rmp->protocol = ntohs (nat_proto_to_ip_proto (s->nat_proto)); } - if (is_ed_session (s) || is_fwd_bypass_session (s)) - { clib_memcpy (rmp->ext_host_address, &s->ext_host_addr, 4); rmp->ext_host_port = s->ext_host_port; - if (is_twice_nat_session (s)) + if (nat44_ed_is_twice_nat_session (s)) { clib_memcpy (rmp->ext_host_nat_address, &s->ext_host_nat_addr, 4); rmp->ext_host_nat_port = s->ext_host_nat_port; } - } vl_api_send_msg (reg, (u8 *) rmp); } @@ -1264,9 +1662,9 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * ip.src_address.as_u32 = ukey.addr.as_u32; ukey.fib_index = fib_table_find (FIB_PROTOCOL_IP4, ntohl (mp->vrf_id)); if (sm->num_workers > 1) - tsm = - vec_elt_at_index (sm->per_thread_data, - sm->worker_in2out_cb (&ip, ukey.fib_index, 0)); + tsm = vec_elt_at_index ( + sm->per_thread_data, + nat44_ed_get_in2out_worker_index (0, &ip, ukey.fib_index, 0)); else tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers); @@ -1278,245 +1676,97 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * } } -static nat44_lb_addr_port_t * -unformat_nat44_lb_addr_port (vl_api_nat44_lb_addr_port_t * addr_port_pairs, - u32 addr_port_pair_num) -{ - u8 i; - nat44_lb_addr_port_t *lb_addr_port_pairs = 0, lb_addr_port; - vl_api_nat44_lb_addr_port_t *ap; - - for (i = 0; i < addr_port_pair_num; i++) - { - ap = &addr_port_pairs[i]; - clib_memset (&lb_addr_port, 0, sizeof (lb_addr_port)); - clib_memcpy (&lb_addr_port.addr, ap->addr, 4); - lb_addr_port.port = ap->port; - lb_addr_port.probability = ap->probability; - lb_addr_port.vrf_id = clib_net_to_host_u32 (ap->vrf_id); - vec_add1 (lb_addr_port_pairs, lb_addr_port); - } - - return lb_addr_port_pairs; -} - -static void - vl_api_nat44_add_del_lb_static_mapping_t_handler - (vl_api_nat44_add_del_lb_static_mapping_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_add_del_lb_static_mapping_reply_t *rmp; - twice_nat_type_t twice_nat = TWICE_NAT_DISABLED; - int rv = 0; - nat44_lb_addr_port_t *locals = 0; - ip4_address_t e_addr; - nat_protocol_t proto; - u8 *tag = 0; - - locals = - unformat_nat44_lb_addr_port (mp->locals, - clib_net_to_host_u32 (mp->local_num)); - clib_memcpy (&e_addr, mp->external_addr, 4); - proto = ip_proto_to_nat_proto (mp->protocol); - - if (mp->flags & NAT_API_IS_TWICE_NAT) - twice_nat = TWICE_NAT; - else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT) - twice_nat = TWICE_NAT_SELF; - mp->tag[sizeof (mp->tag) - 1] = 0; - tag = format (0, "%s", mp->tag); - vec_terminate_c_string (tag); - - rv = - nat44_add_del_lb_static_mapping (e_addr, - mp->external_port, - proto, locals, mp->is_add, - twice_nat, - mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, - clib_net_to_host_u32 (mp->affinity)); - - vec_free (locals); - vec_free (tag); - REPLY_MACRO (VL_API_NAT44_ADD_DEL_LB_STATIC_MAPPING_REPLY); -} - -static void - vl_api_nat44_lb_static_mapping_add_del_local_t_handler - (vl_api_nat44_lb_static_mapping_add_del_local_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_lb_static_mapping_add_del_local_reply_t *rmp; - int rv = 0; - ip4_address_t e_addr, l_addr; - nat_protocol_t proto; - - clib_memcpy (&e_addr, mp->external_addr, 4); - clib_memcpy (&l_addr, mp->local.addr, 4); - proto = ip_proto_to_nat_proto (mp->protocol); - - rv = - nat44_lb_static_mapping_add_del_local (e_addr, - mp->external_port, - l_addr, - mp->local.port, - proto, - clib_net_to_host_u32 (mp-> - local.vrf_id), - mp->local.probability, mp->is_add); - - REPLY_MACRO (VL_API_NAT44_LB_STATIC_MAPPING_ADD_DEL_LOCAL_REPLY); -} - static void -send_nat44_lb_static_mapping_details (snat_static_mapping_t * m, - vl_api_registration_t * reg, - u32 context) +send_nat44_user_session_v2_details (snat_session_t *s, + vl_api_registration_t *reg, u32 context) { - vl_api_nat44_lb_static_mapping_details_t *rmp; + vl_api_nat44_user_session_v2_details_t *rmp; snat_main_t *sm = &snat_main; - nat44_lb_addr_port_t *ap; - vl_api_nat44_lb_addr_port_t *locals; - u32 local_num = 0; + u64 now = vlib_time_now (sm->vnet_main->vlib_main); + u64 sess_timeout_time = 0; - rmp = - vl_msg_api_alloc (sizeof (*rmp) + - (pool_elts (m->locals) * - sizeof (nat44_lb_addr_port_t))); + rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = - ntohs (VL_API_NAT44_LB_STATIC_MAPPING_DETAILS + sm->msg_id_base); + ntohs (VL_API_NAT44_USER_SESSION_V2_DETAILS + sm->msg_id_base); + clib_memcpy (rmp->outside_ip_address, (&s->out2in.addr), 4); + clib_memcpy (rmp->inside_ip_address, (&s->in2out.addr), 4); - clib_memcpy (rmp->external_addr, &(m->external_addr), 4); - rmp->external_port = m->external_port; - rmp->protocol = nat_proto_to_ip_proto (m->proto); - rmp->context = context; + if (snat_is_session_static (s)) + rmp->flags |= NAT_API_IS_STATIC; - if (m->twice_nat == TWICE_NAT) + if (is_twice_nat_session (s)) rmp->flags |= NAT_API_IS_TWICE_NAT; - else if (m->twice_nat == TWICE_NAT_SELF) - rmp->flags |= NAT_API_IS_SELF_TWICE_NAT; - if (is_out2in_only_static_mapping (m)) - rmp->flags |= NAT_API_IS_OUT2IN_ONLY; - if (m->tag) - strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag)); - - locals = (vl_api_nat44_lb_addr_port_t *) rmp->locals; - pool_foreach (ap, m->locals) - { - clib_memcpy (locals->addr, &(ap->addr), 4); - locals->port = ap->port; - locals->probability = ap->probability; - locals->vrf_id = ntohl (ap->vrf_id); - locals++; - local_num++; - } - rmp->local_num = ntohl (local_num); - - vl_api_send_msg (reg, (u8 *) rmp); -} - -static void - vl_api_nat44_lb_static_mapping_dump_t_handler - (vl_api_nat44_lb_static_mapping_dump_t * mp) -{ - vl_api_registration_t *reg; - snat_main_t *sm = &snat_main; - snat_static_mapping_t *m; - - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; - - pool_foreach (m, sm->static_mappings) - { - if (is_lb_static_mapping(m)) - send_nat44_lb_static_mapping_details (m, reg, mp->context); - } -} - -static void -vl_api_nat44_del_session_t_handler (vl_api_nat44_del_session_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_del_session_reply_t *rmp; - ip4_address_t addr, eh_addr; - u16 port, eh_port; - u32 vrf_id; - int rv = 0; - u8 is_in; - memcpy (&addr.as_u8, mp->address, 4); - port = mp->port; - vrf_id = clib_net_to_host_u32 (mp->vrf_id); - memcpy (&eh_addr.as_u8, mp->ext_host_address, 4); - eh_port = mp->ext_host_port; + if (is_ed_session (s) || is_fwd_bypass_session (s)) + rmp->flags |= NAT_API_IS_EXT_HOST_VALID; - is_in = mp->flags & NAT_API_IS_INSIDE; + rmp->last_heard = clib_host_to_net_u64 ((u64) s->last_heard); + rmp->total_bytes = clib_host_to_net_u64 (s->total_bytes); + rmp->total_pkts = ntohl (s->total_pkts); + rmp->context = context; + if (snat_is_unk_proto_session (s)) + { + rmp->outside_port = 0; + rmp->inside_port = 0; + rmp->protocol = ntohs (s->in2out.port); + } + else + { + rmp->outside_port = s->out2in.port; + rmp->inside_port = s->in2out.port; + rmp->protocol = ntohs (nat_proto_to_ip_proto (s->nat_proto)); + } + if (is_ed_session (s) || is_fwd_bypass_session (s)) + { + clib_memcpy (rmp->ext_host_address, &s->ext_host_addr, 4); + rmp->ext_host_port = s->ext_host_port; + if (is_twice_nat_session (s)) + { + clib_memcpy (rmp->ext_host_nat_address, &s->ext_host_nat_addr, 4); + rmp->ext_host_nat_port = s->ext_host_nat_port; + } + } - rv = nat44_del_ed_session (sm, &addr, port, &eh_addr, eh_port, mp->protocol, - vrf_id, is_in); + sess_timeout_time = s->last_heard + (f64) nat_session_get_timeout ( + &sm->timeouts, s->nat_proto, s->state); + rmp->is_timed_out = (now >= sess_timeout_time); - REPLY_MACRO (VL_API_NAT44_DEL_SESSION_REPLY); + vl_api_send_msg (reg, (u8 *) rmp); } static void - vl_api_nat44_forwarding_enable_disable_t_handler - (vl_api_nat44_forwarding_enable_disable_t * mp) +vl_api_nat44_user_session_v2_dump_t_handler ( + vl_api_nat44_user_session_v2_dump_t *mp) { - vl_api_nat44_forwarding_enable_disable_reply_t *rmp; + snat_main_per_thread_data_t *tsm; snat_main_t *sm = &snat_main; - int rv = 0; - nat44_ed_forwarding_enable_disable (mp->enable); - REPLY_MACRO (VL_API_NAT44_FORWARDING_ENABLE_DISABLE_REPLY); -} - -static void - vl_api_nat44_forwarding_is_enabled_t_handler - (vl_api_nat44_forwarding_is_enabled_t * mp) -{ vl_api_registration_t *reg; - snat_main_t *sm = &snat_main; - vl_api_nat44_forwarding_is_enabled_reply_t *rmp; + snat_user_key_t ukey; + snat_session_t *s; + ip4_header_t ip; reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) return; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = - ntohs (VL_API_NAT44_FORWARDING_IS_ENABLED_REPLY + sm->msg_id_base); - rmp->context = mp->context; - - rmp->enabled = sm->forwarding_enabled; - - vl_api_send_msg (reg, (u8 *) rmp); -} - -static void -vl_api_nat44_ed_set_fq_options_t_handler (vl_api_nat44_ed_set_fq_options_t *mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_ed_set_fq_options_reply_t *rmp; - int rv = 0; - u32 frame_queue_nelts = ntohl (mp->frame_queue_nelts); - rv = nat44_ed_set_frame_queue_nelts (frame_queue_nelts); - REPLY_MACRO (VL_API_NAT44_ED_SET_FQ_OPTIONS_REPLY); -} + clib_memcpy (&ukey.addr, mp->ip_address, 4); + ip.src_address.as_u32 = ukey.addr.as_u32; + ukey.fib_index = fib_table_find (FIB_PROTOCOL_IP4, ntohl (mp->vrf_id)); + if (sm->num_workers > 1) + tsm = vec_elt_at_index ( + sm->per_thread_data, + nat44_ed_get_in2out_worker_index (0, &ip, ukey.fib_index, 0)); + else + tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers); -static void -vl_api_nat44_ed_show_fq_options_t_handler ( - vl_api_nat44_ed_show_fq_options_t *mp) -{ - snat_main_t *sm = &snat_main; - vl_api_nat44_ed_show_fq_options_reply_t *rmp; - int rv = 0; - /* clang-format off */ - REPLY_MACRO2_ZERO (VL_API_NAT44_ED_SHOW_FQ_OPTIONS_REPLY, - ({ - rmp->frame_queue_nelts = htonl (sm->frame_queue_nelts); - })); - /* clang-format on */ + pool_foreach (s, tsm->sessions) + { + if (s->in2out.addr.as_u32 == ukey.addr.as_u32) + { + send_nat44_user_session_v2_details (s, reg, mp->context); + } + } } /* API definitions */