X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat_api.c;h=c58e88bd7f01a1195b9093ece0af5ec76c498400;hb=6bb080f1e;hp=55e6bf9e90fbb7b288f3a6a271e366aad12d8d65;hpb=8254ab87f2b975c4c3324dc9ac08b7f7b6c167ee;p=vpp.git diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c index 55e6bf9e90f..c58e88bd7f0 100644 --- a/src/plugins/nat/nat_api.c +++ b/src/plugins/nat/nat_api.c @@ -22,16 +22,16 @@ #include #include #include -#include -#include #include +#include +#include #include #include #include #include +#include -#define vl_api_nat44_lb_addr_port_t_endian vl_noop_handler #define vl_api_nat44_add_del_lb_static_mapping_t_endian vl_noop_handler #define vl_api_nat44_nat44_lb_static_mapping_details_t_endian vl_noop_handler @@ -62,7 +62,6 @@ vec_free (s); \ return handle; - /******************************/ /*** Common NAT plugin APIs ***/ /******************************/ @@ -97,7 +96,7 @@ 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; - dslite_main_t *dm = &dslite_main; + //dslite_main_t *dm = &dslite_main; nat64_main_t *n64m = &nat64_main; int rv = 0; @@ -105,9 +104,9 @@ vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t * mp) REPLY_MACRO2 (VL_API_NAT_SHOW_CONFIG_REPLY, ({ rmp->translation_buckets = htonl (sm->translation_buckets); - rmp->translation_memory_size = htonl (sm->translation_memory_size); + rmp->translation_memory_size = clib_host_to_net_u64 (sm->translation_memory_size); rmp->user_buckets = htonl (sm->user_buckets); - rmp->user_memory_size = htonl (sm->user_memory_size); + rmp->user_memory_size = clib_host_to_net_u64 (sm->user_memory_size); rmp->max_translations_per_user = htonl (sm->max_translations_per_user); rmp->outside_vrf_id = htonl (sm->outside_vrf_id); rmp->inside_vrf_id = htonl (sm->inside_vrf_id); @@ -117,11 +116,11 @@ vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t * mp) rmp->deterministic = sm->deterministic; rmp->endpoint_dependent = sm->endpoint_dependent; rmp->out2in_dpo = sm->out2in_dpo; - rmp->dslite_ce = dm->is_ce; - rmp->nat64_bib_buckets = n64m->bib_buckets; - rmp->nat64_bib_memory_size = n64m->bib_memory_size; - rmp->nat64_st_buckets = n64m->st_buckets; - rmp->nat64_st_memory_size = n64m->st_memory_size; + //rmp->dslite_ce = dm->is_ce; + rmp->nat64_bib_buckets = clib_net_to_host_u32(n64m->bib_buckets); + rmp->nat64_bib_memory_size = clib_net_to_host_u64(n64m->bib_memory_size); + rmp->nat64_st_buckets = clib_net_to_host_u32(n64m->st_buckets); + rmp->nat64_st_memory_size = clib_net_to_host_u64(n64m->st_memory_size); })); /* *INDENT-ON* */ } @@ -243,175 +242,89 @@ vl_api_nat_worker_dump_t_print (vl_api_nat_worker_dump_t * mp, void *handle) } static void -vl_api_nat_ipfix_enable_disable_t_handler (vl_api_nat_ipfix_enable_disable_t * - mp) +vl_api_nat44_set_session_limit_t_handler (vl_api_nat44_set_session_limit_t * + mp) { snat_main_t *sm = &snat_main; - vl_api_nat_ipfix_enable_disable_reply_t *rmp; + vl_api_nat44_set_session_limit_reply_t *rmp; int rv = 0; - rv = snat_ipfix_logging_enable_disable (mp->enable, - clib_host_to_net_u32 - (mp->domain_id), - clib_host_to_net_u16 - (mp->src_port)); + rv = nat44_set_session_limit + (ntohl (mp->session_limit), ntohl (mp->vrf_id)); - REPLY_MACRO (VL_API_NAT_IPFIX_ENABLE_DISABLE_REPLY); + REPLY_MACRO (VL_API_NAT_SET_WORKERS_REPLY); } static void * -vl_api_nat_ipfix_enable_disable_t_print (vl_api_nat_ipfix_enable_disable_t * - mp, void *handle) +vl_api_nat44_set_session_limit_t_print (vl_api_nat44_set_session_limit_t * + mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: nat_ipfix_enable_disable "); - if (mp->domain_id) - s = format (s, "domain %d ", clib_net_to_host_u32 (mp->domain_id)); - if (mp->src_port) - s = format (s, "src_port %d ", clib_net_to_host_u16 (mp->src_port)); - if (!mp->enable) - s = format (s, "disable "); + s = format (0, "SCRIPT: nat44_set_session_limit "); + s = format (s, "session_limit %d", ntohl (mp->session_limit)); + s = format (s, "vrf_id %d", ntohl (mp->vrf_id)); FINISH; } static void -vl_api_nat_set_reass_t_handler (vl_api_nat_set_reass_t * mp) +vl_api_nat_set_log_level_t_handler (vl_api_nat_set_log_level_t * mp) { snat_main_t *sm = &snat_main; - vl_api_nat_set_reass_reply_t *rmp; + vl_api_nat_set_log_level_reply_t *rmp; int rv = 0; - rv = - nat_reass_set (ntohl (mp->timeout), ntohs (mp->max_reass), mp->max_frag, - mp->drop_frag, mp->is_ip6); + if (sm->log_level > NAT_LOG_DEBUG) + rv = VNET_API_ERROR_UNSUPPORTED; + else + sm->log_level = mp->log_level; - REPLY_MACRO (VL_API_NAT_SET_REASS_REPLY); + REPLY_MACRO (VL_API_NAT_SET_WORKERS_REPLY); } static void * -vl_api_nat_set_reass_t_print (vl_api_nat_set_reass_t * mp, void *handle) +vl_api_nat_set_log_level_t_print (vl_api_nat_set_log_level_t * + mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: nat_set_reass "); - s = format (s, "timeout %d max_reass %d max_frag %d drop_frag %d is_ip6 %d", - clib_host_to_net_u32 (mp->timeout), - clib_host_to_net_u16 (mp->max_reass), - mp->max_frag, mp->drop_frag, mp->is_ip6); + s = format (0, "SCRIPT: nat_set_log_level "); + s = format (s, "log_level %d", mp->log_level); FINISH; } static void -vl_api_nat_get_reass_t_handler (vl_api_nat_get_reass_t * mp) +vl_api_nat_ipfix_enable_disable_t_handler (vl_api_nat_ipfix_enable_disable_t * + mp) { snat_main_t *sm = &snat_main; - vl_api_nat_get_reass_reply_t *rmp; + vl_api_nat_ipfix_enable_disable_reply_t *rmp; int rv = 0; - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_NAT_GET_REASS_REPLY, - ({ - rmp->ip4_timeout = htonl (nat_reass_get_timeout(0)); - rmp->ip4_max_reass = htons (nat_reass_get_max_reass(0)); - rmp->ip4_max_frag = nat_reass_get_max_frag(0); - rmp->ip4_drop_frag = nat_reass_is_drop_frag(0); - rmp->ip6_timeout = htonl (nat_reass_get_timeout(1)); - rmp->ip6_max_reass = htons (nat_reass_get_max_reass(1)); - rmp->ip6_max_frag = nat_reass_get_max_frag(1); - rmp->ip6_drop_frag = nat_reass_is_drop_frag(1); - })) - /* *INDENT-ON* */ -} - -static void * -vl_api_nat_get_reass_t_print (vl_api_nat_get_reass_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: nat_get_reass"); - - FINISH; -} - -typedef struct nat_api_walk_ctx_t_ -{ - vl_api_registration_t *reg; - u32 context; -} nat_api_walk_ctx_t; - -static int -nat_ip4_reass_walk_api (nat_reass_ip4_t * reass, void *arg) -{ - vl_api_nat_reass_details_t *rmp; - snat_main_t *sm = &snat_main; - nat_api_walk_ctx_t *ctx = arg; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_NAT_REASS_DETAILS + sm->msg_id_base); - rmp->context = ctx->context; - clib_memcpy (rmp->src_addr, &(reass->key.src), 4); - clib_memcpy (rmp->dst_addr, &(reass->key.dst), 4); - rmp->proto = reass->key.proto; - rmp->frag_id = ntohl (reass->key.frag_id); - rmp->frag_n = reass->frag_n; - rmp->is_ip4 = 1; - - vl_api_send_msg (ctx->reg, (u8 *) rmp); - - return 0; -} - -static int -nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg) -{ - vl_api_nat_reass_details_t *rmp; - snat_main_t *sm = &snat_main; - nat_api_walk_ctx_t *ctx = arg; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_NAT_REASS_DETAILS + sm->msg_id_base); - rmp->context = ctx->context; - clib_memcpy (rmp->src_addr, &(reass->key.src), 16); - clib_memcpy (rmp->dst_addr, &(reass->key.dst), 16); - rmp->proto = reass->key.proto; - rmp->frag_id = ntohl (reass->key.frag_id); - rmp->frag_n = reass->frag_n; - rmp->is_ip4 = 0; - - vl_api_send_msg (ctx->reg, (u8 *) rmp); - - return 0; -} - -static void -vl_api_nat_reass_dump_t_handler (vl_api_nat_reass_dump_t * mp) -{ - vl_api_registration_t *reg; - - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; - - nat_api_walk_ctx_t ctx = { - .reg = reg, - .context = mp->context, - }; + rv = snat_ipfix_logging_enable_disable (mp->enable, + clib_host_to_net_u32 + (mp->domain_id), + clib_host_to_net_u16 + (mp->src_port)); - nat_ip4_reass_walk (nat_ip4_reass_walk_api, &ctx); - nat_ip6_reass_walk (nat_ip6_reass_walk_api, &ctx); + REPLY_MACRO (VL_API_NAT_IPFIX_ENABLE_DISABLE_REPLY); } static void * -vl_api_nat_reass_dump_t_print (vl_api_nat_reass_dump_t * mp, void *handle) +vl_api_nat_ipfix_enable_disable_t_print (vl_api_nat_ipfix_enable_disable_t * + mp, void *handle) { u8 *s; - s = format (0, "SCRIPT: nat_reass_dump"); + s = format (0, "SCRIPT: nat_ipfix_enable_disable "); + if (mp->domain_id) + s = format (s, "domain %d ", clib_net_to_host_u32 (mp->domain_id)); + if (mp->src_port) + s = format (s, "src_port %d ", clib_net_to_host_u16 (mp->src_port)); + if (!mp->enable) + s = format (s, "disable "); FINISH; } @@ -630,9 +543,228 @@ vl_api_nat_get_mss_clamping_t_print (vl_api_nat_get_mss_clamping_t * mp, FINISH; } +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; + ip4_address_t addr; + int rv; + + memcpy (&addr, &mp->ip_address, sizeof (addr)); + rv = + nat_ha_set_listener (&addr, clib_net_to_host_u16 (mp->port), + clib_net_to_host_u32 (mp->path_mtu)); + + REPLY_MACRO (VL_API_NAT_HA_SET_LISTENER_REPLY); +} + +static void * +vl_api_nat_ha_set_listener_t_print (vl_api_nat_ha_set_listener_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_set_listener "); + s = format (s, "ip_address %U ", format_ip4_address, mp->ip_address); + s = format (s, "port %d ", clib_net_to_host_u16 (mp->port)); + s = format (s, "path_mtu %d", clib_net_to_host_u32 (mp->path_mtu)); + + FINISH; +} + +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 = 0; + ip4_address_t addr; + u16 port; + u32 path_mtu; + + nat_ha_get_listener (&addr, &port, &path_mtu); + + /* *INDENT-OFF* */ + REPLY_MACRO2 (VL_API_NAT_HA_GET_LISTENER_REPLY, + ({ + clib_memcpy (rmp->ip_address, &addr, sizeof (ip4_address_t)); + rmp->port = clib_host_to_net_u16 (port); + rmp->path_mtu = clib_host_to_net_u32 (path_mtu); + })) + /* *INDENT-ON* */ +} + +static void * +vl_api_nat_ha_get_listener_t_print (vl_api_nat_ha_get_listener_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_get_listener"); + + FINISH; +} + +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; + ip4_address_t addr; + int rv; + + memcpy (&addr, &mp->ip_address, sizeof (addr)); + rv = + nat_ha_set_failover (&addr, clib_net_to_host_u16 (mp->port), + clib_net_to_host_u32 (mp->session_refresh_interval)); + + REPLY_MACRO (VL_API_NAT_HA_SET_FAILOVER_REPLY); +} + +static void * +vl_api_nat_ha_set_failover_t_print (vl_api_nat_ha_set_failover_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_set_failover "); + s = format (s, "ip_address %U ", format_ip4_address, mp->ip_address); + s = format (s, "port %d ", clib_net_to_host_u16 (mp->port)); + + FINISH; +} + +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 = 0; + ip4_address_t addr; + u16 port; + u32 session_refresh_interval; + + nat_ha_get_failover (&addr, &port, &session_refresh_interval); + + /* *INDENT-OFF* */ + REPLY_MACRO2 (VL_API_NAT_HA_GET_FAILOVER_REPLY, + ({ + clib_memcpy (rmp->ip_address, &addr, sizeof (ip4_address_t)); + rmp->port = clib_host_to_net_u16 (port); + rmp->session_refresh_interval = clib_host_to_net_u32 (session_refresh_interval); + })) + /* *INDENT-ON* */ +} + +static void * +vl_api_nat_ha_get_failover_t_print (vl_api_nat_ha_get_failover_t * mp, + void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_get_failover"); + + FINISH; +} + +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 = 0; + + nat_ha_flush (0); + + REPLY_MACRO (VL_API_NAT_HA_FLUSH_REPLY); +} + +static void * +vl_api_nat_ha_flush_t_print (vl_api_nat_ha_flush_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_flush "); + + FINISH; +} + +static void +nat_ha_resync_completed_event_cb (u32 client_index, u32 pid, u32 missed_count) +{ + snat_main_t *sm = &snat_main; + vl_api_registration_t *reg; + vl_api_nat_ha_resync_completed_event_t *mp; + + reg = vl_api_client_index_to_registration (client_index); + if (!reg) + return; + + mp = vl_msg_api_alloc (sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); + mp->client_index = client_index; + mp->pid = pid; + mp->missed_count = clib_host_to_net_u32 (missed_count); + mp->_vl_msg_id = + ntohs (VL_API_NAT_HA_RESYNC_COMPLETED_EVENT + sm->msg_id_base); + + vl_api_send_msg (reg, (u8 *) mp); +} + +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; + + rv = + nat_ha_resync (mp->client_index, mp->pid, + mp->want_resync_event ? nat_ha_resync_completed_event_cb : + NULL); + + REPLY_MACRO (VL_API_NAT_HA_RESYNC_REPLY); +} + +static void * +vl_api_nat_ha_resync_t_print (vl_api_nat_ha_resync_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: nat_ha_resync "); + s = + format (s, "want_resync_event %d pid %d", mp->want_resync_event, + clib_host_to_net_u32 (mp->pid)); + + FINISH; +} + /*************/ /*** NAT44 ***/ /*************/ +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; + ip4_address_t addr; + int rv; + memcpy (&addr.as_u8, mp->ip_address, 4); + rv = nat44_user_del (&addr, ntohl (mp->fib_index)); + REPLY_MACRO (VL_API_NAT44_DEL_USER_REPLY); +} + +static void *vl_api_nat44_del_user_t_print + (vl_api_nat44_del_user_t * mp, void *handle) +{ + u8 *s; + s = format (0, "SCRIPT: nat44_del_user "); + s = format (s, "ip_address %U fib_index %U ", + format_ip4_address, mp->ip_address, ntohl (mp->fib_index)); + FINISH; +} + static void vl_api_nat44_add_del_address_range_t_handler (vl_api_nat44_add_del_address_range_t * mp) @@ -640,6 +772,7 @@ static void snat_main_t *sm = &snat_main; vl_api_nat44_add_del_address_range_reply_t *rmp; ip4_address_t this_addr; + u8 is_add, twice_nat; u32 start_host_order, end_host_order; u32 vrf_id; int i, count; @@ -658,6 +791,9 @@ static void goto send_reply; } + is_add = mp->is_add; + twice_nat = mp->flags & NAT_API_IS_TWICE_NAT; + tmp = (u32 *) mp->first_ip_address; start_host_order = clib_host_to_net_u32 (tmp[0]); tmp = (u32 *) mp->last_ip_address; @@ -676,16 +812,16 @@ static void for (i = 0; i < count; i++) { - if (mp->is_add) - rv = snat_add_address (sm, &this_addr, vrf_id, mp->twice_nat); + if (is_add) + rv = snat_add_address (sm, &this_addr, vrf_id, twice_nat); else - rv = snat_del_address (sm, this_addr, 0, mp->twice_nat); + rv = snat_del_address (sm, this_addr, 0, twice_nat); if (rv) goto send_reply; if (sm->out2in_dpo) - nat44_add_del_address_dpo (this_addr, mp->is_add); + nat44_add_del_address_dpo (this_addr, is_add); increment_v4_address (&this_addr); } @@ -705,7 +841,7 @@ static void *vl_api_nat44_add_del_address_range_t_print { s = format (s, " - %U ", format_ip4_address, mp->last_ip_address); } - s = format (s, "twice_nat %d ", mp->twice_nat); + s = format (s, "twice_nat %d ", mp->flags & NAT_API_IS_TWICE_NAT); FINISH; } @@ -728,7 +864,8 @@ send_nat44_address_details (snat_address_t * a, } else rmp->vrf_id = ~0; - rmp->twice_nat = twice_nat; + if (twice_nat) + rmp->flags |= NAT_API_IS_TWICE_NAT; rmp->context = context; vl_api_send_msg (reg, (u8 *) rmp); @@ -773,13 +910,17 @@ static void { snat_main_t *sm = &snat_main; vl_api_nat44_interface_add_del_feature_reply_t *rmp; - u8 is_del = mp->is_add == 0; u32 sw_if_index = ntohl (mp->sw_if_index); + u8 is_del; int rv = 0; + is_del = !mp->is_add; + VALIDATE_SW_IF_INDEX (mp); - rv = snat_interface_add_del (sw_if_index, mp->is_inside, is_del); + rv = + snat_interface_add_del (sw_if_index, mp->flags & NAT_API_IS_INSIDE, + is_del); BAD_SW_IF_INDEX_LABEL; @@ -794,7 +935,8 @@ static void *vl_api_nat44_interface_add_del_feature_t_print s = format (0, "SCRIPT: nat44_interface_add_del_feature "); s = format (s, "sw_if_index %d %s %s", clib_host_to_net_u32 (mp->sw_if_index), - mp->is_inside ? "in" : "out", mp->is_add ? "" : "del"); + mp->flags & NAT_API_IS_INSIDE ? "in" : "out", + mp->is_add ? "" : "del"); FINISH; } @@ -810,9 +952,12 @@ send_nat44_interface_details (snat_interface_t * i, clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT44_INTERFACE_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (i->sw_if_index); - rmp->is_inside = (nat_interface_is_inside (i) - && nat_interface_is_outside (i)) ? 2 : - nat_interface_is_inside (i); + + if (nat_interface_is_inside (i)) + rmp->flags |= NAT_API_IS_INSIDE; + if (nat_interface_is_outside (i)) + rmp->flags |= NAT_API_IS_OUTSIDE; + rmp->context = context; vl_api_send_msg (reg, (u8 *) rmp); @@ -854,7 +999,6 @@ static void { snat_main_t *sm = &snat_main; vl_api_nat44_interface_add_del_output_feature_reply_t *rmp; - u8 is_del = mp->is_add == 0; u32 sw_if_index = ntohl (mp->sw_if_index); int rv = 0; @@ -866,8 +1010,9 @@ static void VALIDATE_SW_IF_INDEX (mp); - rv = snat_interface_add_del_output_feature (sw_if_index, mp->is_inside, - is_del); + rv = snat_interface_add_del_output_feature (sw_if_index, + mp->flags & NAT_API_IS_INSIDE, + !mp->is_add); BAD_SW_IF_INDEX_LABEL; send_reply: @@ -882,7 +1027,8 @@ static void *vl_api_nat44_interface_add_del_output_feature_t_print s = format (0, "SCRIPT: nat44_interface_add_del_output_feature "); s = format (s, "sw_if_index %d %s %s", clib_host_to_net_u32 (mp->sw_if_index), - mp->is_inside ? "in" : "out", mp->is_add ? "" : "del"); + mp->flags & NAT_API_IS_INSIDE ? "in" : "out", + mp->is_add ? "" : "del"); FINISH; } @@ -901,7 +1047,9 @@ send_nat44_interface_output_feature_details (snat_interface_t * i, ntohs (VL_API_NAT44_INTERFACE_OUTPUT_FEATURE_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (i->sw_if_index); rmp->context = context; - rmp->is_inside = nat_interface_is_inside (i); + + if (nat_interface_is_inside (i)) + rmp->flags |= NAT_API_IS_INSIDE; vl_api_send_msg (reg, (u8 *) rmp); } @@ -961,27 +1109,31 @@ static void memcpy (&local_addr.as_u8, mp->local_ip_address, 4); memcpy (&external_addr.as_u8, mp->external_ip_address, 4); - if (mp->addr_only == 0) + + if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) { local_port = clib_net_to_host_u16 (mp->local_port); external_port = clib_net_to_host_u16 (mp->external_port); } + 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_snat_proto (mp->protocol); - if (mp->twice_nat) + + if (mp->flags & NAT_API_IS_TWICE_NAT) twice_nat = TWICE_NAT; - else if (mp->self_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->addr_only, - external_sw_if_index, proto, mp->is_add, - twice_nat, mp->out2in_only, tag, 0); - + 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); vec_free (tag); send_reply: @@ -999,13 +1151,14 @@ static void *vl_api_nat44_add_del_static_mapping_t_print format_ip4_address, mp->local_ip_address, format_ip4_address, mp->external_ip_address); - if (mp->addr_only == 0) + if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) s = format (s, "local_port %d external_port %d ", clib_net_to_host_u16 (mp->local_port), clib_net_to_host_u16 (mp->external_port)); s = format (s, "twice_nat %d out2in_only %d ", - mp->twice_nat, mp->out2in_only); + mp->flags & NAT_API_IS_TWICE_NAT, + mp->flags & NAT_API_IS_OUT2IN_ONLY); if (mp->vrf_id != ~0) s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id)); @@ -1022,28 +1175,38 @@ send_nat44_static_mapping_details (snat_static_mapping_t * m, { vl_api_nat44_static_mapping_details_t *rmp; snat_main_t *sm = &snat_main; + u32 len = sizeof (*rmp); - rmp = vl_msg_api_alloc (sizeof (*rmp)); - clib_memset (rmp, 0, sizeof (*rmp)); + rmp = vl_msg_api_alloc (len); + clib_memset (rmp, 0, len); rmp->_vl_msg_id = ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base); - rmp->addr_only = is_addr_only_static_mapping (m); + clib_memcpy (rmp->local_ip_address, &(m->local_addr), 4); clib_memcpy (rmp->external_ip_address, &(m->external_addr), 4); rmp->external_sw_if_index = ~0; rmp->vrf_id = htonl (m->vrf_id); rmp->context = context; + if (m->twice_nat == TWICE_NAT) - rmp->twice_nat = 1; + rmp->flags |= NAT_API_IS_TWICE_NAT; else if (m->twice_nat == TWICE_NAT_SELF) - rmp->self_twice_nat = 1; - rmp->out2in_only = is_out2in_only_static_mapping (m); - if (rmp->addr_only == 0) + rmp->flags |= NAT_API_IS_SELF_TWICE_NAT; + + if (is_out2in_only_static_mapping (m)) + rmp->flags |= NAT_API_IS_OUT2IN_ONLY; + + if (is_addr_only_static_mapping (m)) + { + rmp->flags |= NAT_API_IS_ADDR_ONLY; + } + else { rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->external_port = htons (m->external_port); rmp->local_port = htons (m->local_port); } + if (m->tag) strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag)); @@ -1062,13 +1225,19 @@ send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m, clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base); - rmp->addr_only = m->addr_only; clib_memcpy (rmp->local_ip_address, &(m->l_addr), 4); rmp->external_sw_if_index = htonl (m->sw_if_index); rmp->vrf_id = htonl (m->vrf_id); rmp->context = context; - rmp->twice_nat = m->twice_nat; - if (m->addr_only == 0) + + if (m->twice_nat) + rmp->flags |= NAT_API_IS_TWICE_NAT; + + if (m->addr_only) + { + rmp->flags |= NAT_API_IS_ADDR_ONLY; + } + else { rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->external_port = htons (m->e_port); @@ -1143,7 +1312,7 @@ static void goto send_reply; } - if (mp->addr_only == 0) + if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) { port = clib_net_to_host_u16 (mp->port); proto = ip_proto_to_snat_proto (mp->protocol); @@ -1159,9 +1328,9 @@ static void vec_terminate_c_string (tag); rv = - snat_add_static_mapping (addr, addr, port, port, vrf_id, mp->addr_only, - sw_if_index, proto, mp->is_add, 0, 0, tag, 1); - + 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); vec_free (tag); send_reply: @@ -1179,7 +1348,7 @@ static void *vl_api_nat44_add_del_identity_mapping_t_print else s = format (s, "addr %U", format_ip4_address, mp->ip_address); - if (mp->addr_only == 0) + if (!(mp->flags & NAT_API_IS_ADDR_ONLY)) s = format (s, " protocol %d port %d", mp->protocol, clib_net_to_host_u16 (mp->port)); @@ -1202,7 +1371,10 @@ send_nat44_identity_mapping_details (snat_static_mapping_t * m, int index, clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base); - rmp->addr_only = is_addr_only_static_mapping (m); + + if (is_addr_only_static_mapping (m)) + rmp->flags |= NAT_API_IS_ADDR_ONLY; + clib_memcpy (rmp->ip_address, &(m->local_addr), 4); rmp->port = htons (m->local_port); rmp->sw_if_index = ~0; @@ -1227,7 +1399,10 @@ send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m, clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base); - rmp->addr_only = m->addr_only; + + if (m->addr_only) + rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_ADDR_ONLY; + rmp->port = htons (m->l_port); rmp->sw_if_index = htonl (m->sw_if_index); rmp->vrf_id = htonl (m->vrf_id); @@ -1293,9 +1468,9 @@ static void { snat_main_t *sm = &snat_main; vl_api_nat44_add_del_interface_addr_reply_t *rmp; - u8 is_del = mp->is_add == 0; u32 sw_if_index = ntohl (mp->sw_if_index); int rv = 0; + u8 is_del; if (sm->deterministic) { @@ -1303,9 +1478,12 @@ 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->twice_nat); + rv = snat_add_interface_address (sm, sw_if_index, is_del, + mp->flags & NAT_API_IS_TWICE_NAT); BAD_SW_IF_INDEX_LABEL; send_reply: @@ -1320,7 +1498,7 @@ static void *vl_api_nat44_add_del_interface_addr_t_print s = format (0, "SCRIPT: nat44_add_del_interface_addr "); s = format (s, "sw_if_index %d twice_nat %d %s", clib_host_to_net_u32 (mp->sw_if_index), - mp->twice_nat, mp->is_add ? "" : "del"); + mp->flags & NAT_API_IS_TWICE_NAT, mp->is_add ? "" : "del"); FINISH; } @@ -1338,7 +1516,9 @@ send_nat44_interface_addr_details (u32 sw_if_index, rmp->_vl_msg_id = ntohs (VL_API_NAT44_INTERFACE_ADDR_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (sw_if_index); - rmp->twice_nat = twice_nat; + + if (twice_nat) + rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_TWICE_NAT; rmp->context = context; vl_api_send_msg (reg, (u8 *) rmp); @@ -1453,10 +1633,16 @@ send_nat44_user_session_details (snat_session_t * s, 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); - rmp->is_static = snat_is_session_static (s) ? 1 : 0; - rmp->is_twicenat = is_twice_nat_session (s) ? 1 : 0; - rmp->ext_host_valid = is_ed_session (s) - || is_fwd_bypass_session (s) ? 1 : 0; + + if (snat_is_session_static (s)) + rmp->flags |= NAT_API_IS_STATIC; + + if (is_twice_nat_session (s)) + rmp->flags |= NAT_API_IS_TWICE_NAT; + + if (is_ed_session (s) || is_fwd_bypass_session (s)) + 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); rmp->total_pkts = ntohl (s->total_pkts); @@ -1516,29 +1702,43 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t * if (sm->num_workers > 1) tsm = vec_elt_at_index (sm->per_thread_data, - sm->worker_in2out_cb (&ip, ukey.fib_index)); + sm->worker_in2out_cb (&ip, ukey.fib_index, 0)); else tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers); - if (clib_bihash_search_8_8 (&tsm->user_hash, &key, &value)) - return; - u = pool_elt_at_index (tsm->users, value.value); - if (!u->nsessions && !u->nstaticsessions) - return; - - head_index = u->sessions_per_user_list_head_index; - head = pool_elt_at_index (tsm->list_pool, head_index); - elt_index = head->next; - elt = pool_elt_at_index (tsm->list_pool, elt_index); - session_index = elt->value; - while (session_index != ~0) + if (!sm->endpoint_dependent) { - s = pool_elt_at_index (tsm->sessions, session_index); - - send_nat44_user_session_details (s, reg, mp->context); - - elt_index = elt->next; + if (clib_bihash_search_8_8 (&tsm->user_hash, &key, &value)) + return; + u = pool_elt_at_index (tsm->users, value.value); + if (!u->nsessions && !u->nstaticsessions) + return; + + head_index = u->sessions_per_user_list_head_index; + head = pool_elt_at_index (tsm->list_pool, head_index); + elt_index = head->next; elt = pool_elt_at_index (tsm->list_pool, elt_index); session_index = elt->value; + while (session_index != ~0) + { + s = pool_elt_at_index (tsm->sessions, session_index); + + send_nat44_user_session_details (s, reg, mp->context); + + elt_index = elt->next; + elt = pool_elt_at_index (tsm->list_pool, elt_index); + session_index = elt->value; + } + } + else + { + /* *INDENT-OFF* */ + pool_foreach (s, tsm->sessions, { + if (s->in2out.addr.as_u32 == ukey.addr.as_u32) + { + send_nat44_user_session_details (s, reg, mp->context); + } + }); + /* *INDENT-ON* */ } } @@ -1602,9 +1802,10 @@ static void clib_net_to_host_u32 (mp->local_num)); clib_memcpy (&e_addr, mp->external_addr, 4); proto = ip_proto_to_snat_proto (mp->protocol); - if (mp->twice_nat) + + if (mp->flags & NAT_API_IS_TWICE_NAT) twice_nat = TWICE_NAT; - else if (mp->self_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); @@ -1613,8 +1814,9 @@ static void rv = nat44_add_del_lb_static_mapping (e_addr, clib_net_to_host_u16 (mp->external_port), - proto, locals, mp->is_add, twice_nat, - mp->out2in_only, tag, + 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); @@ -1631,7 +1833,9 @@ static void *vl_api_nat44_add_del_lb_static_mapping_t_print s = format (0, "SCRIPT: nat44_add_del_lb_static_mapping "); s = format (s, "is_add %d twice_nat %d out2in_only %d ", - mp->is_add, mp->twice_nat, mp->out2in_only); + mp->is_add, + mp->flags & NAT_API_IS_TWICE_NAT, + mp->flags & NAT_API_IS_OUT2IN_ONLY); FINISH; } @@ -1705,11 +1909,13 @@ send_nat44_lb_static_mapping_details (snat_static_mapping_t * m, rmp->external_port = ntohs (m->external_port); rmp->protocol = snat_proto_to_ip_proto (m->proto); rmp->context = context; + if (m->twice_nat == TWICE_NAT) - rmp->twice_nat = 1; + rmp->flags |= NAT_API_IS_TWICE_NAT; else if (m->twice_nat == TWICE_NAT_SELF) - rmp->self_twice_nat = 1; - rmp->out2in_only = is_out2in_only_static_mapping (m); + 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)); @@ -1773,6 +1979,7 @@ vl_api_nat44_del_session_t_handler (vl_api_nat44_del_session_t * mp) u16 port, eh_port; u32 vrf_id; int rv = 0; + u8 is_in; snat_protocol_t proto; if (sm->deterministic) @@ -1788,12 +1995,14 @@ vl_api_nat44_del_session_t_handler (vl_api_nat44_del_session_t * mp) memcpy (&eh_addr.as_u8, mp->ext_host_address, 4); eh_port = clib_net_to_host_u16 (mp->ext_host_port); - if (mp->ext_host_valid) + is_in = mp->flags & NAT_API_IS_INSIDE; + + if (mp->flags & NAT_API_IS_EXT_HOST_VALID) rv = nat44_del_ed_session (sm, &addr, port, &eh_addr, eh_port, mp->protocol, - vrf_id, mp->is_in); + vrf_id, is_in); else - rv = nat44_del_session (sm, &addr, port, proto, vrf_id, mp->is_in); + rv = nat44_del_session (sm, &addr, port, proto, vrf_id, is_in); send_reply: REPLY_MACRO (VL_API_NAT44_DEL_SESSION_REPLY); @@ -1809,8 +2018,9 @@ vl_api_nat44_del_session_t_print (vl_api_nat44_del_session_t * mp, s = format (s, "addr %U port %d protocol %d vrf_id %d is_in %d", format_ip4_address, mp->address, clib_net_to_host_u16 (mp->port), - mp->protocol, clib_net_to_host_u32 (mp->vrf_id), mp->is_in); - if (mp->ext_host_valid) + mp->protocol, clib_net_to_host_u32 (mp->vrf_id), + mp->flags & NAT_API_IS_INSIDE); + if (mp->flags & NAT_API_IS_EXT_HOST_VALID) s = format (s, "ext_host_address %U ext_host_port %d", format_ip4_address, mp->ext_host_address, clib_net_to_host_u16 (mp->ext_host_port)); @@ -1843,12 +2053,21 @@ static void vec_add1 (ses_to_be_removed, s - tsm->sessions); } })); - vec_foreach (ses_index, ses_to_be_removed) - { - s = pool_elt_at_index(tsm->sessions, ses_index[0]); - nat_free_session_data (sm, s, tsm - sm->per_thread_data); - nat44_delete_session (sm, s, tsm - sm->per_thread_data); - } + if(sm->endpoint_dependent){ + vec_foreach (ses_index, ses_to_be_removed) + { + s = pool_elt_at_index(tsm->sessions, ses_index[0]); + nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0); + nat44_ed_delete_session (sm, s, tsm - sm->per_thread_data, 1); + } + }else{ + vec_foreach (ses_index, ses_to_be_removed) + { + s = pool_elt_at_index(tsm->sessions, ses_index[0]); + nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0); + nat44_delete_session (sm, s, tsm - sm->per_thread_data); + } + } vec_free (ses_to_be_removed); } /* *INDENT-ON* */ @@ -1919,12 +2138,6 @@ vl_api_nat_det_add_del_map_t_handler (vl_api_nat_det_add_del_map_t * mp) goto send_reply; } - if (!mp->is_nat44) - { - rv = VNET_API_ERROR_UNIMPLEMENTED; - goto send_reply; - } - clib_memcpy (&in_addr, mp->in_addr, 4); clib_memcpy (&out_addr, mp->out_addr, 4); rv = snat_det_add_map (sm, &in_addr, mp->in_plen, &out_addr, @@ -1965,13 +2178,6 @@ vl_api_nat_det_forward_t_handler (vl_api_nat_det_forward_t * mp) return; } - if (!mp->is_nat44) - { - out_addr.as_u32 = 0; - rv = VNET_API_ERROR_UNIMPLEMENTED; - goto send_reply; - } - out_addr.as_u32 = 0; clib_memcpy (&in_addr, mp->in_addr, 4); dm = snat_det_map_by_user (sm, &in_addr); @@ -2037,8 +2243,6 @@ send_reply: /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_NAT_DET_REVERSE_REPLY, ({ - rmp->is_nat44 = 1; - clib_memset (rmp->in_addr, 0, 16); clib_memcpy (rmp->in_addr, &in_addr, 4); })) /* *INDENT-ON* */ @@ -2066,7 +2270,6 @@ sent_nat_det_map_details (snat_det_map_t * m, vl_api_registration_t * reg, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT_DET_MAP_DETAILS + sm->msg_id_base); - rmp->is_nat44 = 1; clib_memcpy (rmp->in_addr, &m->in_addr, 4); rmp->in_plen = m->in_plen; clib_memcpy (rmp->out_addr, &m->out_addr, 4); @@ -2185,12 +2388,6 @@ vl_api_nat_det_close_session_in_t_handler (vl_api_nat_det_close_session_in_t * goto send_reply; } - if (!mp->is_nat44) - { - rv = VNET_API_ERROR_UNIMPLEMENTED; - goto send_reply; - } - clib_memcpy (&in_addr, mp->in_addr, 4); clib_memcpy (&ext_addr, mp->ext_addr, 4); @@ -2264,8 +2461,6 @@ vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp) reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) return; - if (!mp->is_nat44) - return; clib_memset (&empty_ses, 0, sizeof (empty_ses)); clib_memcpy (&user_addr, mp->user_addr, 4); @@ -2324,8 +2519,7 @@ static void for (i = 0; i < count; i++) { - if ((rv = nat64_add_del_pool_addr (vlib_get_thread_index (), - &this_addr, vrf_id, mp->is_add))) + if ((rv = nat64_add_del_pool_addr (0, &this_addr, vrf_id, mp->is_add))) goto send_reply; increment_v4_address (&this_addr); @@ -2422,8 +2616,8 @@ vl_api_nat64_add_del_interface_t_handler (vl_api_nat64_add_del_interface_t * VALIDATE_SW_IF_INDEX (mp); rv = - nat64_add_del_interface (ntohl (mp->sw_if_index), mp->is_inside, - mp->is_add); + nat64_add_del_interface (ntohl (mp->sw_if_index), + mp->flags & NAT_API_IS_INSIDE, mp->is_add); BAD_SW_IF_INDEX_LABEL; @@ -2439,7 +2633,8 @@ vl_api_nat64_add_del_interface_t_print (vl_api_nat64_add_del_interface_t * mp, s = format (0, "SCRIPT: nat64_add_del_interface "); s = format (s, "sw_if_index %d %s %s", clib_host_to_net_u32 (mp->sw_if_index), - mp->is_inside ? "in" : "out", mp->is_add ? "" : "del"); + mp->flags & NAT_API_IS_INSIDE ? "in" : "out", + mp->is_add ? "" : "del"); FINISH; } @@ -2455,9 +2650,12 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg) clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT64_INTERFACE_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (i->sw_if_index); - rmp->is_inside = (nat_interface_is_inside (i) - && nat_interface_is_outside (i)) ? 2 : - nat_interface_is_inside (i); + + if (nat_interface_is_inside (i)) + rmp->flags |= NAT_API_IS_INSIDE; + if (nat_interface_is_outside (i)) + rmp->flags |= NAT_API_IS_OUTSIDE; + rmp->context = ctx->context; vl_api_send_msg (ctx->reg, (u8 *) rmp); @@ -2555,7 +2753,8 @@ nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg) rmp->o_port = bibe->out_port; rmp->vrf_id = ntohl (fib->ft_table_id); rmp->proto = bibe->proto; - rmp->is_static = bibe->is_static; + if (bibe->is_static) + rmp->flags |= NAT_API_IS_STATIC; rmp->ses_num = ntohl (bibe->ses_num); vl_api_send_msg (ctx->reg, (u8 *) rmp); @@ -2674,10 +2873,10 @@ vl_api_nat64_add_del_prefix_t_handler (vl_api_nat64_add_del_prefix_t * mp) ip6_address_t prefix; int rv = 0; - memcpy (&prefix.as_u8, mp->prefix, 16); + memcpy (&prefix.as_u8, mp->prefix.address, 16); rv = - nat64_add_del_prefix (&prefix, mp->prefix_len, + nat64_add_del_prefix (&prefix, mp->prefix.len, clib_net_to_host_u32 (mp->vrf_id), mp->is_add); REPLY_MACRO (VL_API_NAT64_ADD_DEL_PREFIX_REPLY); } @@ -2689,7 +2888,7 @@ vl_api_nat64_add_del_prefix_t_print (vl_api_nat64_add_del_prefix_t * mp, u8 *s; s = format (0, "SCRIPT: nat64_add_del_prefix %U/%u vrf_id %u %s\n", - format_ip6_address, mp->prefix, mp->prefix_len, + format_ip6_address, mp->prefix.address, mp->prefix.len, ntohl (mp->vrf_id), mp->is_add ? "" : "del"); FINISH; @@ -2705,8 +2904,8 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg) rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT64_PREFIX_DETAILS + sm->msg_id_base); - clib_memcpy (rmp->prefix, &(p->prefix), 16); - rmp->prefix_len = p->plen; + clib_memcpy (rmp->prefix.address, &(p->prefix), 16); + rmp->prefix.len = p->plen; rmp->vrf_id = ntohl (p->vrf_id); rmp->context = ctx->context; @@ -2774,229 +2973,6 @@ static void *vl_api_nat64_add_del_interface_addr_t_print FINISH; } -/***************/ -/*** DS-Lite ***/ -/***************/ - -static void -vl_api_dslite_set_aftr_addr_t_handler (vl_api_dslite_set_aftr_addr_t * mp) -{ - vl_api_dslite_set_aftr_addr_reply_t *rmp; - snat_main_t *sm = &snat_main; - dslite_main_t *dm = &dslite_main; - int rv = 0; - ip6_address_t ip6_addr; - ip4_address_t ip4_addr; - - memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16); - memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4); - - rv = dslite_set_aftr_ip6_addr (dm, &ip6_addr); - if (rv == 0) - rv = dslite_set_aftr_ip4_addr (dm, &ip4_addr); - - REPLY_MACRO (VL_API_DSLITE_SET_AFTR_ADDR_REPLY); -} - -static void * -vl_api_dslite_set_aftr_addr_t_print (vl_api_dslite_set_aftr_addr_t * mp, - void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_set_aftr_addr "); - s = format (s, "ip6_addr %U ip4_addr %U\n", - format_ip6_address, mp->ip6_addr, - format_ip4_address, mp->ip4_addr); - - FINISH; -} - -static void -vl_api_dslite_get_aftr_addr_t_handler (vl_api_dslite_get_aftr_addr_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_dslite_get_aftr_addr_reply_t *rmp; - dslite_main_t *dm = &dslite_main; - int rv = 0; - - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY, - ({ - memcpy (rmp->ip4_addr, &dm->aftr_ip4_addr.as_u8, 4); - memcpy (rmp->ip6_addr, &dm->aftr_ip6_addr.as_u8, 16); - })) - /* *INDENT-ON* */ -} - -static void * -vl_api_dslite_get_aftr_addr_t_print (vl_api_dslite_get_aftr_addr_t * mp, - void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_get_aftr_addr"); - - FINISH; -} - -static void -vl_api_dslite_set_b4_addr_t_handler (vl_api_dslite_set_b4_addr_t * mp) -{ - vl_api_dslite_set_b4_addr_reply_t *rmp; - snat_main_t *sm = &snat_main; - dslite_main_t *dm = &dslite_main; - int rv = 0; - ip6_address_t ip6_addr; - ip4_address_t ip4_addr; - - memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16); - memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4); - - rv = dslite_set_b4_ip6_addr (dm, &ip6_addr); - if (rv == 0) - rv = dslite_set_b4_ip4_addr (dm, &ip4_addr); - - REPLY_MACRO (VL_API_DSLITE_SET_B4_ADDR_REPLY); -} - -static void * -vl_api_dslite_set_b4_addr_t_print (vl_api_dslite_set_b4_addr_t * mp, - void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_set_b4_addr "); - s = format (s, "ip6_addr %U ip4_addr %U\n", - format_ip6_address, mp->ip6_addr, - format_ip6_address, mp->ip4_addr); - - FINISH; -} - -static void -vl_api_dslite_get_b4_addr_t_handler (vl_api_dslite_get_b4_addr_t * mp) -{ - snat_main_t *sm = &snat_main; - vl_api_dslite_get_b4_addr_reply_t *rmp; - dslite_main_t *dm = &dslite_main; - int rv = 0; - - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY, - ({ - memcpy (rmp->ip4_addr, &dm->b4_ip4_addr.as_u8, 4); - memcpy (rmp->ip6_addr, &dm->b4_ip6_addr.as_u8, 16); - })) - /* *INDENT-ON* */ -} - -static void * -vl_api_dslite_get_b4_addr_t_print (vl_api_dslite_get_b4_addr_t * mp, - void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_get_b4_addr"); - - FINISH; -} - -static void - vl_api_dslite_add_del_pool_addr_range_t_handler - (vl_api_dslite_add_del_pool_addr_range_t * mp) -{ - vl_api_dslite_add_del_pool_addr_range_reply_t *rmp; - snat_main_t *sm = &snat_main; - dslite_main_t *dm = &dslite_main; - int rv = 0; - ip4_address_t this_addr; - u32 start_host_order, end_host_order; - int i, count; - u32 *tmp; - - tmp = (u32 *) mp->start_addr; - start_host_order = clib_host_to_net_u32 (tmp[0]); - tmp = (u32 *) mp->end_addr; - end_host_order = clib_host_to_net_u32 (tmp[0]); - - count = (end_host_order - start_host_order) + 1; - memcpy (&this_addr.as_u8, mp->start_addr, 4); - - for (i = 0; i < count; i++) - { - if ((rv = dslite_add_del_pool_addr (dm, &this_addr, mp->is_add))) - goto send_reply; - - increment_v4_address (&this_addr); - } - -send_reply: - REPLY_MACRO (VL_API_DSLITE_ADD_DEL_POOL_ADDR_RANGE_REPLY); -} - -static void -send_dslite_address_details (snat_address_t * ap, - vl_api_registration_t * reg, u32 context) -{ - vl_api_dslite_address_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_DSLITE_ADDRESS_DETAILS + sm->msg_id_base); - clib_memcpy (rmp->ip_address, &(ap->addr), 4); - rmp->context = context; - - vl_api_send_msg (reg, (u8 *) rmp); -} - -static void -vl_api_dslite_address_dump_t_handler (vl_api_dslite_address_dump_t * mp) -{ - vl_api_registration_t *reg; - dslite_main_t *dm = &dslite_main; - snat_address_t *ap; - - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; - - /* *INDENT-OFF* */ - vec_foreach (ap, dm->addr_pool) - { - send_dslite_address_details (ap, reg, mp->context); - } - /* *INDENT-ON* */ -} - -static void * -vl_api_dslite_address_dump_t_print (vl_api_dslite_address_dump_t * mp, - void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_address_dump "); - - FINISH; -} - -static void *vl_api_dslite_add_del_pool_addr_range_t_print - (vl_api_dslite_add_del_pool_addr_range_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dslite_add_del_pool_addr_range "); - s = format (s, "%U - %U\n", - format_ip4_address, mp->start_addr, - format_ip4_address, mp->end_addr); - - FINISH; -} - - /*************/ /*** NAT66 ***/ /*************/ @@ -3012,8 +2988,8 @@ vl_api_nat66_add_del_interface_t_handler (vl_api_nat66_add_del_interface_t * VALIDATE_SW_IF_INDEX (mp); rv = - nat66_interface_add_del (ntohl (mp->sw_if_index), mp->is_inside, - mp->is_add); + nat66_interface_add_del (ntohl (mp->sw_if_index), + mp->flags & NAT_API_IS_INSIDE, mp->is_add); BAD_SW_IF_INDEX_LABEL; @@ -3029,7 +3005,8 @@ vl_api_nat66_add_del_interface_t_print (vl_api_nat66_add_del_interface_t * mp, s = format (0, "SCRIPT: nat66_add_del_interface "); s = format (s, "sw_if_index %d %s %s", clib_host_to_net_u32 (mp->sw_if_index), - mp->is_inside ? "in" : "out", mp->is_add ? "" : "del"); + mp->flags & NAT_API_IS_INSIDE ? "in" : "out", + mp->is_add ? "" : "del"); FINISH; } @@ -3070,7 +3047,7 @@ static void *vl_api_nat66_add_del_static_mapping_t_print typedef struct nat66_api_walk_ctx_t_ { - svm_queue_t *q; + vl_api_registration_t *rp; u32 context; } nat66_api_walk_ctx_t; @@ -3085,10 +3062,11 @@ nat66_api_interface_walk (snat_interface_t * i, void *arg) clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_NAT66_INTERFACE_DETAILS + sm->msg_id_base); rmp->sw_if_index = ntohl (i->sw_if_index); - rmp->is_inside = nat_interface_is_inside (i); + if (nat_interface_is_inside (i)) + rmp->flags |= NAT_API_IS_INSIDE; rmp->context = ctx->context; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->rp, (u8 *) rmp); return 0; } @@ -3096,14 +3074,14 @@ nat66_api_interface_walk (snat_interface_t * i, void *arg) static void vl_api_nat66_interface_dump_t_handler (vl_api_nat66_interface_dump_t * mp) { - svm_queue_t *q; + vl_api_registration_t *rp; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + rp = vl_api_client_index_to_registration (mp->client_index); + if (rp == 0) return; nat66_api_walk_ctx_t ctx = { - .q = q, + .rp = rp, .context = mp->context, }; @@ -3148,7 +3126,7 @@ nat66_api_static_mapping_walk (nat66_static_mapping_t * m, void *arg) rmp->total_pkts = clib_host_to_net_u64 (vc.packets); rmp->context = ctx->context; - vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp); + vl_api_send_msg (ctx->rp, (u8 *) rmp); return 0; } @@ -3157,14 +3135,14 @@ static void vl_api_nat66_static_mapping_dump_t_handler (vl_api_nat66_static_mapping_dump_t * mp) { - svm_queue_t *q; + vl_api_registration_t *rp; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + rp = vl_api_client_index_to_registration (mp->client_index); + if (rp == 0) return; nat66_api_walk_ctx_t ctx = { - .q = q, + .rp = rp, .context = mp->context, }; @@ -3189,16 +3167,22 @@ _(NAT_CONTROL_PING, nat_control_ping) \ _(NAT_SHOW_CONFIG, nat_show_config) \ _(NAT_SET_WORKERS, nat_set_workers) \ _(NAT_WORKER_DUMP, nat_worker_dump) \ +_(NAT44_DEL_USER, nat44_del_user) \ +_(NAT44_SET_SESSION_LIMIT, nat44_set_session_limit) \ +_(NAT_SET_LOG_LEVEL, nat_set_log_level) \ _(NAT_IPFIX_ENABLE_DISABLE, nat_ipfix_enable_disable) \ -_(NAT_SET_REASS, nat_set_reass) \ -_(NAT_GET_REASS, nat_get_reass) \ -_(NAT_REASS_DUMP, nat_reass_dump) \ _(NAT_SET_TIMEOUTS, nat_set_timeouts) \ _(NAT_GET_TIMEOUTS, nat_get_timeouts) \ _(NAT_SET_ADDR_AND_PORT_ALLOC_ALG, nat_set_addr_and_port_alloc_alg) \ _(NAT_GET_ADDR_AND_PORT_ALLOC_ALG, nat_get_addr_and_port_alloc_alg) \ _(NAT_SET_MSS_CLAMPING, nat_set_mss_clamping) \ _(NAT_GET_MSS_CLAMPING, nat_get_mss_clamping) \ +_(NAT_HA_SET_LISTENER, nat_ha_set_listener) \ +_(NAT_HA_SET_FAILOVER, nat_ha_set_failover) \ +_(NAT_HA_GET_LISTENER, nat_ha_get_listener) \ +_(NAT_HA_GET_FAILOVER, nat_ha_get_failover) \ +_(NAT_HA_FLUSH, nat_ha_flush) \ +_(NAT_HA_RESYNC, nat_ha_resync) \ _(NAT44_ADD_DEL_ADDRESS_RANGE, nat44_add_del_address_range) \ _(NAT44_INTERFACE_ADD_DEL_FEATURE, nat44_interface_add_del_feature) \ _(NAT44_ADD_DEL_STATIC_MAPPING, nat44_add_del_static_mapping) \ @@ -3239,12 +3223,6 @@ _(NAT64_ST_DUMP, nat64_st_dump) \ _(NAT64_ADD_DEL_PREFIX, nat64_add_del_prefix) \ _(NAT64_PREFIX_DUMP, nat64_prefix_dump) \ _(NAT64_ADD_DEL_INTERFACE_ADDR, nat64_add_del_interface_addr) \ -_(DSLITE_ADD_DEL_POOL_ADDR_RANGE, dslite_add_del_pool_addr_range) \ -_(DSLITE_ADDRESS_DUMP, dslite_address_dump) \ -_(DSLITE_SET_AFTR_ADDR, dslite_set_aftr_addr) \ -_(DSLITE_GET_AFTR_ADDR, dslite_get_aftr_addr) \ -_(DSLITE_SET_B4_ADDR, dslite_set_b4_addr) \ -_(DSLITE_GET_B4_ADDR, dslite_get_b4_addr) \ _(NAT66_ADD_DEL_INTERFACE, nat66_add_del_interface) \ _(NAT66_INTERFACE_DUMP, nat66_interface_dump) \ _(NAT66_ADD_DEL_STATIC_MAPPING, nat66_add_del_static_mapping) \