*/
#include <nat/nat.h>
-#include <nat/nat_det.h>
#include <nat/nat64.h>
-#include <nat/nat66.h>
-#include <nat/dslite.h>
-#include <nat/nat_reass.h>
#include <nat/nat_inlines.h>
+#include <nat/nat44/inlines.h>
#include <nat/nat_ha.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <nat/nat_msg_enum.h>
#include <vnet/fib/fib_table.h>
#include <vnet/ip/ip_types_api.h>
+#include <nat/nat44/ed_inlines.h>
+#include <nat/nat_ipfix_logging.h>
-#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
{
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;
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_u32 (
+ sm->translation_memory_size > 0xffffffffULL
+ ? 0xffffffffUL
+ : (u32)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);
rmp->static_mapping_only = sm->static_mapping_only;
rmp->static_mapping_connection_tracking =
sm->static_mapping_connection_tracking;
- rmp->deterministic = sm->deterministic;
+ rmp->deterministic = 0;
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* */
}
FINISH;
}
+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;
+ //dslite_main_t *dm = &dslite_main;
+ nat64_main_t *n64m = &nat64_main;
+ int rv = 0;
+
+ /* *INDENT-OFF* */
+ REPLY_MACRO2 (VL_API_NAT_SHOW_CONFIG_2_REPLY,
+ ({
+ rmp->translation_buckets = htonl (sm->translation_buckets);
+ rmp->translation_memory_size = clib_host_to_net_u64 (sm->translation_memory_size);
+ rmp->user_buckets = htonl (sm->user_buckets);
+ 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);
+ rmp->static_mapping_only = sm->static_mapping_only;
+ rmp->static_mapping_connection_tracking =
+ sm->static_mapping_connection_tracking;
+ rmp->deterministic = 0;
+ rmp->endpoint_dependent = sm->endpoint_dependent;
+ rmp->out2in_dpo = sm->out2in_dpo;
+ //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);
+ rmp->max_translations_per_thread = clib_net_to_host_u32(sm->max_translations_per_thread);
+ rmp->max_users_per_thread = clib_net_to_host_u32(sm->max_users_per_thread);
+ }));
+ /* *INDENT-ON* */
+}
+
+static void *
+vl_api_nat_show_config_2_t_print (vl_api_nat_show_config_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: nat_show_config_2 ");
+
+ FINISH;
+}
+
static void
vl_api_nat_set_workers_t_handler (vl_api_nat_set_workers_t * mp)
{
uword *bitmap = 0;
u64 mask;
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
mask = clib_net_to_host_u64 (mp->worker_mask);
if (sm->num_workers < 2)
snat_main_t *sm = &snat_main;
vlib_worker_thread_t *w =
vlib_worker_threads + worker_index + sm->first_worker_index;
- u32 len = vec_len (w->name);
-
- if (len)
- --len;
- rmp = vl_msg_api_alloc (sizeof (*rmp) + len);
- clib_memset (rmp, 0, sizeof (*rmp) + len);
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_NAT_WORKER_DETAILS + sm->msg_id_base);
rmp->context = context;
rmp->worker_index = htonl (worker_index);
rmp->lcore_id = htonl (w->cpu_id);
-
- if (len)
- vl_api_to_api_string (len, (char *) w->name, &rmp->name);
+ strncpy ((char *) rmp->name, (char *) w->name, ARRAY_LEN (rmp->name) - 1);
vl_api_send_msg (reg, (u8 *) rmp);
}
snat_main_t *sm = &snat_main;
u32 *worker_index;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
}
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;
- ip46_address_t ip_address;
-
- 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 (&ip_address.ip4, &reass->key.src, 4);
- ip_address_encode (&ip_address, IP46_TYPE_IP4, &rmp->src_addr);
-
- clib_memcpy (&ip_address.ip4, &reass->key.dst, 4);
- ip_address_encode (&ip_address, IP46_TYPE_IP4, &rmp->dst_addr);
-
- rmp->proto = reass->key.proto;
- rmp->frag_id = ntohl (reass->key.frag_id);
- rmp->frag_n = reass->frag_n;
-
- 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;
- ip46_address_t ip_address;
-
- 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 (&ip_address.ip6, &reass->key.src, 16);
- ip_address_encode (&ip_address, IP46_TYPE_IP6, &rmp->src_addr);
-
- clib_memcpy (&ip_address.ip6, &reass->key.dst, 16);
- ip_address_encode (&ip_address, IP46_TYPE_IP6, &rmp->dst_addr);
-
- rmp->proto = reass->key.proto;
- rmp->frag_id = ntohl (reass->key.frag_id);
- rmp->frag_n = reass->frag_n;
-
- 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;
}
int rv = 0;
u16 port_start, port_end;
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
switch (mp->alg)
{
case NAT_ADDR_AND_PORT_ALLOC_ALG_DEFAULT:
int rv = 0;
if (mp->enable)
- {
- sm->mss_clamping = ntohs (mp->mss_value);
- sm->mss_value_net = mp->mss_value;
- }
+ sm->mss_clamping = ntohs (mp->mss_value);
else
sm->mss_clamping = 0;
/*************/
/*** 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)
int rv = 0;
u32 *tmp;
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
if (sm->static_mapping_only)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
snat_main_t *sm = &snat_main;
snat_address_t *a;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
u32 sw_if_index = ntohl (mp->sw_if_index);
int rv = 0;
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
VALIDATE_SW_IF_INDEX (mp);
rv = snat_interface_add_del_output_feature (sw_if_index,
!mp->is_add);
BAD_SW_IF_INDEX_LABEL;
-send_reply:
REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE_REPLY);
}
snat_main_t *sm = &snat_main;
snat_interface_t *i;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
{
snat_main_t *sm = &snat_main;
vl_api_nat44_add_del_static_mapping_reply_t *rmp;
- ip4_address_t local_addr, external_addr;
+ 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;
int rv = 0;
- snat_protocol_t proto;
+ nat_protocol_t proto;
u8 *tag = 0;
- u32 len = 0;
- if (sm->deterministic)
+ 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))
{
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
+ local_port = mp->local_port;
+ external_port = mp->external_port;
}
- len = vl_api_string_len (&mp->tag);
+ 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 (len > 64)
- {
- rv = VNET_API_ERROR_INVALID_VALUE;
- goto send_reply;
- }
+ 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);
+
+ REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_REPLY);
+}
+
+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;
+ int rv = 0;
+ nat_protocol_t proto;
+ u8 *tag = 0;
+ 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))
{
- local_port = clib_net_to_host_u16 (mp->local_port);
- external_port = clib_net_to_host_u16 (mp->external_port);
+ local_port = mp->local_port;
+ external_port = 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);
+ 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;
-
- tag = vec_new (u8, len);
-
- memcpy (tag, mp->tag.buf, len);
+ 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,
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);
+ mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, 0,
+ pool_addr, mp->match_pool);
vec_free (tag);
-send_reply:
- REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_REPLY);
+ REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_V2_REPLY);
}
static void *vl_api_nat44_add_del_static_mapping_t_print
FINISH;
}
+static void *vl_api_nat44_add_del_static_mapping_v2_t_print
+ (vl_api_nat44_add_del_static_mapping_v2_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: nat44_add_del_static_mapping_v2 ");
+ s = format (s, "protocol %d local_addr %U external_addr %U ",
+ mp->protocol,
+ format_ip4_address, mp->local_ip_address,
+ format_ip4_address, mp->external_ip_address);
+
+ 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->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));
+
+ if (mp->external_sw_if_index != ~0)
+ s = format (s, "external_sw_if_index %d",
+ clib_net_to_host_u32 (mp->external_sw_if_index));
+ if (mp->match_pool)
+ s = format (s, "match pool address %U",
+ format_ip4_address, mp->pool_ip_address);
+
+ FINISH;
+}
+
static void
send_nat44_static_mapping_details (snat_static_mapping_t * m,
vl_api_registration_t * reg, u32 context)
snat_main_t *sm = &snat_main;
u32 len = sizeof (*rmp);
- if (m->tag)
- {
- len += vec_len (m->tag);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
- }
- else
- {
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- }
-
+ 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);
}
else
{
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
- rmp->external_port = htons (m->external_port);
- rmp->local_port = htons (m->local_port);
+ rmp->protocol = nat_proto_to_ip_proto (m->proto);
+ rmp->external_port = m->external_port;
+ rmp->local_port = m->local_port;
}
+ if (m->tag)
+ strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
+
vl_api_send_msg (reg, (u8 *) rmp);
}
{
vl_api_nat44_static_mapping_details_t *rmp;
snat_main_t *sm = &snat_main;
- u32 len = sizeof (*rmp);
-
- if (m->tag)
- {
- len += vec_len (m->tag);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
- }
- else
- {
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- }
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base);
clib_memcpy (rmp->local_ip_address, &(m->l_addr), 4);
}
else
{
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
- rmp->external_port = htons (m->e_port);
- rmp->local_port = htons (m->l_port);
+ rmp->protocol = nat_proto_to_ip_proto (m->proto);
+ rmp->external_port = m->e_port;
+ rmp->local_port = m->l_port;
}
+ if (m->tag)
+ strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
vl_api_send_msg (reg, (u8 *) rmp);
}
snat_static_map_resolve_t *rp;
int j;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
{
snat_main_t *sm = &snat_main;
vl_api_nat44_add_del_identity_mapping_reply_t *rmp;
- ip4_address_t addr;
+ ip4_address_t addr, pool_addr = { 0 };
u16 port = 0;
u32 vrf_id, sw_if_index;
int rv = 0;
- snat_protocol_t proto = ~0;
+ nat_protocol_t proto = NAT_PROTOCOL_OTHER;
u8 *tag = 0;
- u32 len = 0;
-
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
if (!(mp->flags & NAT_API_IS_ADDR_ONLY))
{
- port = clib_net_to_host_u16 (mp->port);
- proto = ip_proto_to_snat_proto (mp->protocol);
+ 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);
addr.as_u32 = 0;
else
memcpy (&addr.as_u8, mp->ip_address, 4);
-
- len = vl_api_string_len (&mp->tag);
-
- tag = vec_new (u8, len);
- memcpy (tag, mp->tag.buf, len);
+ 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);
+ proto, mp->is_add, 0, 0, tag, 1, pool_addr, 0);
vec_free (tag);
-send_reply:
REPLY_MACRO (VL_API_NAT44_ADD_DEL_IDENTITY_MAPPING_REPLY);
}
vl_api_nat44_identity_mapping_details_t *rmp;
snat_main_t *sm = &snat_main;
nat44_lb_addr_port_t *local = pool_elt_at_index (m->locals, index);
- u32 len = sizeof (*rmp);
-
- if (m->tag)
- {
- len += vec_len (m->tag);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
- }
- else
- {
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- }
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
rmp->flags |= NAT_API_IS_ADDR_ONLY;
clib_memcpy (rmp->ip_address, &(m->local_addr), 4);
- rmp->port = htons (m->local_port);
+ rmp->port = m->local_port;
rmp->sw_if_index = ~0;
rmp->vrf_id = htonl (local->vrf_id);
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
+ rmp->protocol = nat_proto_to_ip_proto (m->proto);
rmp->context = context;
+ if (m->tag)
+ strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
vl_api_send_msg (reg, (u8 *) rmp);
}
{
vl_api_nat44_identity_mapping_details_t *rmp;
snat_main_t *sm = &snat_main;
- u32 len = sizeof (*rmp);
-
- if (m->tag)
- {
- len += vec_len (m->tag);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
- }
- else
- {
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- }
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
if (m->addr_only)
rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_ADDR_ONLY;
- rmp->port = htons (m->l_port);
+ rmp->port = m->l_port;
rmp->sw_if_index = htonl (m->sw_if_index);
rmp->vrf_id = htonl (m->vrf_id);
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
+ rmp->protocol = nat_proto_to_ip_proto (m->proto);
rmp->context = context;
+ if (m->tag)
+ strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
vl_api_send_msg (reg, (u8 *) rmp);
}
snat_static_map_resolve_t *rp;
int j;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
int rv = 0;
u8 is_del;
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
is_del = !mp->is_add;
VALIDATE_SW_IF_INDEX (mp);
mp->flags & NAT_API_IS_TWICE_NAT);
BAD_SW_IF_INDEX_LABEL;
-send_reply:
REPLY_MACRO (VL_API_NAT44_ADD_DEL_INTERFACE_ADDR_REPLY);
}
snat_main_t *sm = &snat_main;
u32 *i;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
vl_api_send_msg (reg, (u8 *) rmp);
}
+static void
+nat_ed_user_create_helper (snat_main_per_thread_data_t * tsm,
+ 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 (&tsm->user_hash, &key, &value))
+ {
+ pool_get (tsm->users, u);
+ u->addr = k.addr;
+ u->fib_index = k.fib_index;
+ u->nsessions = 0;
+ u->nstaticsessions = 0;
+ key.value = u - tsm->users;
+ clib_bihash_add_del_8_8 (&tsm->user_hash, &key, 1);
+ }
+ else
+ {
+ u = pool_elt_at_index (tsm->users, value.value);
+ }
+ if (snat_is_session_static (s))
+ {
+ ++u->nstaticsessions;
+ }
+ else
+ {
+ ++u->nsessions;
+ }
+}
+
+static void
+nat_ed_users_create (snat_main_per_thread_data_t * tsm)
+{
+ snat_session_t *s;
+ /* *INDENT-OFF* */
+ pool_foreach (s, tsm->sessions, { nat_ed_user_create_helper (tsm, s); });
+ /* *INDENT-ON* */
+}
+
+static void
+nat_ed_users_destroy (snat_main_per_thread_data_t * tsm)
+{
+ snat_user_t *u;
+ /* *INDENT-OFF* */
+ pool_flush (u, tsm->users, { });
+ /* *INDENT-ON* */
+ clib_bihash_free_8_8 (&tsm->user_hash);
+ clib_bihash_init_8_8 (&tsm->user_hash, "users", snat_main.user_buckets,
+ snat_main.user_memory_size);
+ clib_bihash_set_kvp_format_fn_8_8 (&tsm->user_hash, format_user_kvp);
+}
+
static void
vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp)
{
snat_main_per_thread_data_t *tsm;
snat_user_t *u;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
/* *INDENT-OFF* */
vec_foreach (tsm, sm->per_thread_data)
{
+ if (sm->endpoint_dependent)
+ {
+ nat_ed_users_create (tsm);
+ }
pool_foreach (u, tsm->users,
({
send_nat44_user_details (u, reg, mp->context);
}));
+ if (sm->endpoint_dependent)
+ {
+ nat_ed_users_destroy (tsm);
+ }
}
/* *INDENT-ON* */
}
{
rmp->outside_port = s->out2in.port;
rmp->inside_port = s->in2out.port;
- rmp->protocol = ntohs (snat_proto_to_ip_proto (s->in2out.protocol));
+ rmp->protocol = ntohs (nat_proto_to_ip_proto (s->nat_proto));
}
if (is_ed_session (s) || is_fwd_bypass_session (s))
{
dlist_elt_t *head, *elt;
ip4_header_t ip;
- if (sm->deterministic)
- return;
-
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
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* */
}
}
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 = clib_net_to_host_u16 (ap->port);
+ 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);
int rv = 0;
nat44_lb_addr_port_t *locals = 0;
ip4_address_t e_addr;
- snat_protocol_t proto;
- vl_api_string_t *sp;
+ nat_protocol_t proto;
u8 *tag = 0;
- u32 len = 0;
if (!sm->endpoint_dependent)
{
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_snat_proto (mp->protocol);
+ 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;
-
- sp = (void *) &mp->locals +
- sizeof (vl_api_nat44_lb_addr_port_t) *
- clib_net_to_host_u32 (mp->local_num);
-
- len = vl_api_string_len (sp);
-
- tag = vec_new (u8, len);
- memcpy (tag, sp->buf, len);
+ 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,
- clib_net_to_host_u16 (mp->external_port),
+ mp->external_port,
proto, locals, mp->is_add,
twice_nat,
mp->flags & NAT_API_IS_OUT2IN_ONLY, tag,
vl_api_nat44_lb_static_mapping_add_del_local_reply_t *rmp;
int rv = 0;
ip4_address_t e_addr, l_addr;
- snat_protocol_t proto;
+ nat_protocol_t proto;
if (!sm->endpoint_dependent)
{
clib_memcpy (&e_addr, mp->external_addr, 4);
clib_memcpy (&l_addr, mp->local.addr, 4);
- proto = ip_proto_to_snat_proto (mp->protocol);
+ proto = ip_proto_to_nat_proto (mp->protocol);
rv =
nat44_lb_static_mapping_add_del_local (e_addr,
snat_main_t *sm = &snat_main;
nat44_lb_addr_port_t *ap;
vl_api_nat44_lb_addr_port_t *locals;
- vl_api_string_t *sp;
u32 local_num = 0;
- u32 len = sizeof (*rmp);
-
- if (m->tag)
- {
- len += pool_elts (m->locals) *
- sizeof (nat44_lb_addr_port_t) + vec_len (m->tag);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
-
- sp = (void *) &m->locals +
- sizeof (vl_api_nat44_lb_addr_port_t) * pool_elts (m->locals);
- vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, sp);
- }
- else
- {
- len += pool_elts (m->locals) * sizeof (nat44_lb_addr_port_t);
- rmp = vl_msg_api_alloc (len);
- clib_memset (rmp, 0, len);
- }
+ 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 = ntohs (m->external_port);
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
+ rmp->external_port = m->external_port;
+ rmp->protocol = nat_proto_to_ip_proto (m->proto);
rmp->context = context;
if (m->twice_nat == TWICE_NAT)
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;
/* *INDENT-OFF* */
pool_foreach (ap, m->locals,
({
clib_memcpy (locals->addr, &(ap->addr), 4);
- locals->port = htons (ap->port);
+ locals->port = ap->port;
locals->probability = ap->probability;
locals->vrf_id = ntohl (ap->vrf_id);
locals++;
u32 vrf_id;
int rv = 0;
u8 is_in;
- snat_protocol_t proto;
-
- if (sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
+ nat_protocol_t proto;
memcpy (&addr.as_u8, mp->address, 4);
- port = clib_net_to_host_u16 (mp->port);
+ port = mp->port;
vrf_id = clib_net_to_host_u32 (mp->vrf_id);
- proto = ip_proto_to_snat_proto (mp->protocol);
+ proto = ip_proto_to_nat_proto (mp->protocol);
memcpy (&eh_addr.as_u8, mp->ext_host_address, 4);
- eh_port = clib_net_to_host_u16 (mp->ext_host_port);
+ eh_port = mp->ext_host_port;
is_in = mp->flags & NAT_API_IS_INSIDE;
else
rv = nat44_del_session (sm, &addr, port, proto, vrf_id, is_in);
-send_reply:
REPLY_MACRO (VL_API_NAT44_DEL_SESSION_REPLY);
}
{
u8 *s;
- s = format (0, "SCRIPT: nat44_add_del_static_mapping ");
+ s = format (0, "SCRIPT: nat44_add_del_session ");
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),
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, 0);
- 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);
+ nat_ed_session_delete (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* */
FINISH;
}
-/*******************************/
-/*** Deterministic NAT (CGN) ***/
-/*******************************/
+/*************/
+/*** NAT64 ***/
+/*************/
static void
-vl_api_nat_det_add_del_map_t_handler (vl_api_nat_det_add_del_map_t * mp)
+ vl_api_nat64_add_del_pool_addr_range_t_handler
+ (vl_api_nat64_add_del_pool_addr_range_t * mp)
{
+ vl_api_nat64_add_del_pool_addr_range_reply_t *rmp;
snat_main_t *sm = &snat_main;
- vl_api_nat_det_add_del_map_reply_t *rmp;
int rv = 0;
- ip4_address_t in_addr, out_addr;
+ ip4_address_t this_addr;
+ u32 start_host_order, end_host_order;
+ u32 vrf_id;
+ 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;
+
+ vrf_id = clib_host_to_net_u32 (mp->vrf_id);
+
+ memcpy (&this_addr.as_u8, mp->start_addr, 4);
- if (!sm->deterministic)
+ for (i = 0; i < count; i++)
{
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
+ if ((rv = nat64_add_del_pool_addr (0, &this_addr, vrf_id, mp->is_add)))
+ 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,
- mp->out_plen, mp->is_add);
+ increment_v4_address (&this_addr);
+ }
send_reply:
- REPLY_MACRO (VL_API_NAT_DET_ADD_DEL_MAP_REPLY);
+ REPLY_MACRO (VL_API_NAT64_ADD_DEL_POOL_ADDR_RANGE_REPLY);
}
-static void *
-vl_api_nat_det_add_del_map_t_print (vl_api_nat_det_add_del_map_t * mp,
- void *handle)
+static void *vl_api_nat64_add_del_pool_addr_range_t_print
+ (vl_api_nat64_add_del_pool_addr_range_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat_det_add_del_map ");
- s = format (s, "inside address %U/%d outside address %U/%d\n",
- format_ip4_address, mp->in_addr, mp->in_plen,
- format_ip4_address, mp->out_addr, mp->out_plen);
+ s = format (0, "SCRIPT: nat64_add_del_pool_addr_range ");
+ s = format (s, "%U - %U vrf_id %u %s\n",
+ format_ip4_address, mp->start_addr,
+ format_ip4_address, mp->end_addr,
+ ntohl (mp->vrf_id), mp->is_add ? "" : "del");
FINISH;
}
-static void
-vl_api_nat_det_forward_t_handler (vl_api_nat_det_forward_t * mp)
+typedef struct nat64_api_walk_ctx_t_
+{
+ vl_api_registration_t *reg;
+ u32 context;
+ nat64_db_t *db;
+} nat64_api_walk_ctx_t;
+
+static int
+nat64_api_pool_walk (snat_address_t * a, void *arg)
{
+ vl_api_nat64_pool_addr_details_t *rmp;
snat_main_t *sm = &snat_main;
- vl_api_nat_det_forward_reply_t *rmp;
- int rv = 0;
- u16 lo_port = 0, hi_port = 0;
- snat_det_map_t *dm;
- ip4_address_t in_addr, out_addr;
+ nat64_api_walk_ctx_t *ctx = arg;
- if (!sm->deterministic)
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs (VL_API_NAT64_POOL_ADDR_DETAILS + sm->msg_id_base);
+ clib_memcpy (rmp->address, &(a->addr), 4);
+ if (a->fib_index != ~0)
{
- rv = VNET_API_ERROR_UNSUPPORTED;
- REPLY_MACRO (VL_API_NAT_DET_FORWARD_REPLY);
- return;
+ fib_table_t *fib = fib_table_get (a->fib_index, FIB_PROTOCOL_IP6);
+ if (!fib)
+ return -1;
+ rmp->vrf_id = ntohl (fib->ft_table_id);
}
+ else
+ rmp->vrf_id = ~0;
+ rmp->context = ctx->context;
- out_addr.as_u32 = 0;
- clib_memcpy (&in_addr, mp->in_addr, 4);
- dm = snat_det_map_by_user (sm, &in_addr);
- if (!dm)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
+ vl_api_send_msg (ctx->reg, (u8 *) rmp);
- snat_det_forward (dm, &in_addr, &out_addr, &lo_port);
- hi_port = lo_port + dm->ports_per_host - 1;
+ return 0;
+}
-send_reply:
- /* *INDENT-OFF* */
- REPLY_MACRO2 (VL_API_NAT_DET_FORWARD_REPLY,
- ({
- rmp->out_port_lo = ntohs (lo_port);
- rmp->out_port_hi = ntohs (hi_port);
- clib_memcpy (rmp->out_addr, &out_addr, 4);
- }))
- /* *INDENT-ON* */
+static void
+vl_api_nat64_pool_addr_dump_t_handler (vl_api_nat64_pool_addr_dump_t * mp)
+{
+ vl_api_registration_t *reg;
+
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
+ nat64_api_walk_ctx_t ctx = {
+ .reg = reg,
+ .context = mp->context,
+ };
+
+ nat64_pool_addr_walk (nat64_api_pool_walk, &ctx);
}
static void *
-vl_api_nat_det_forward_t_print (vl_api_nat_det_forward_t * mp, void *handle)
+vl_api_nat64_pool_addr_dump_t_print (vl_api_nat64_pool_addr_dump_t * mp,
+ void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat_det_forward");
- s = format (s, "inside ip address %U\n", format_ip4_address, mp->in_addr);
+ s = format (0, "SCRIPT: nat64_pool_addr_dump\n");
FINISH;
}
static void
-vl_api_nat_det_reverse_t_handler (vl_api_nat_det_reverse_t * mp)
+vl_api_nat64_add_del_interface_t_handler (vl_api_nat64_add_del_interface_t *
+ mp)
{
snat_main_t *sm = &snat_main;
- vl_api_nat_det_reverse_reply_t *rmp;
+ vl_api_nat64_add_del_interface_reply_t *rmp;
int rv = 0;
- ip4_address_t out_addr, in_addr;
- snat_det_map_t *dm;
- if (!sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- REPLY_MACRO (VL_API_NAT_DET_REVERSE_REPLY);
- return;
- }
+ VALIDATE_SW_IF_INDEX (mp);
- in_addr.as_u32 = 0;
- clib_memcpy (&out_addr, mp->out_addr, 4);
- dm = snat_det_map_by_out (sm, &out_addr);
- if (!dm)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
+ rv =
+ nat64_add_del_interface (ntohl (mp->sw_if_index),
+ mp->flags & NAT_API_IS_INSIDE, mp->is_add);
- snat_det_reverse (dm, &out_addr, htons (mp->out_port), &in_addr);
+ BAD_SW_IF_INDEX_LABEL;
-send_reply:
- /* *INDENT-OFF* */
- REPLY_MACRO2 (VL_API_NAT_DET_REVERSE_REPLY,
- ({
- clib_memcpy (rmp->in_addr, &in_addr, 4);
- }))
- /* *INDENT-ON* */
+ REPLY_MACRO (VL_API_NAT64_ADD_DEL_INTERFACE_REPLY);
}
static void *
-vl_api_nat_det_reverse_t_print (vl_api_nat_det_reverse_t * mp, void *handle)
+vl_api_nat64_add_del_interface_t_print (vl_api_nat64_add_del_interface_t * mp,
+ void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat_det_reverse");
- s = format (s, "outside ip address %U outside port %d",
- format_ip4_address, mp->out_addr, ntohs (mp->out_port));
+ 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->flags & NAT_API_IS_INSIDE ? "in" : "out",
+ mp->is_add ? "" : "del");
FINISH;
}
-static void
-sent_nat_det_map_details (snat_det_map_t * m, vl_api_registration_t * reg,
- u32 context)
+static int
+nat64_api_interface_walk (snat_interface_t * i, void *arg)
{
- vl_api_nat_det_map_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_NAT_DET_MAP_DETAILS + sm->msg_id_base);
- clib_memcpy (rmp->in_addr, &m->in_addr, 4);
- rmp->in_plen = m->in_plen;
- clib_memcpy (rmp->out_addr, &m->out_addr, 4);
- rmp->out_plen = m->out_plen;
- rmp->sharing_ratio = htonl (m->sharing_ratio);
- rmp->ports_per_host = htons (m->ports_per_host);
- rmp->ses_num = htonl (m->ses_num);
- rmp->context = context;
-
- vl_api_send_msg (reg, (u8 *) rmp);
-}
-
-static void
-vl_api_nat_det_map_dump_t_handler (vl_api_nat_det_map_dump_t * mp)
-{
- vl_api_registration_t *reg;
- snat_main_t *sm = &snat_main;
- snat_det_map_t *m;
-
- if (!sm->deterministic)
- return;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- /* *INDENT-OFF* */
- vec_foreach(m, sm->det_maps)
- sent_nat_det_map_details(m, reg, mp->context);
- /* *INDENT-ON* */
-}
-
-static void *
-vl_api_nat_det_map_dump_t_print (vl_api_nat_det_map_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat_det_map_dump ");
-
- FINISH;
-}
-
-static void
-vl_api_nat_det_close_session_out_t_handler (vl_api_nat_det_close_session_out_t
- * mp)
-{
- snat_main_t *sm = &snat_main;
- vl_api_nat_det_close_session_out_reply_t *rmp;
- ip4_address_t out_addr, ext_addr, in_addr;
- snat_det_out_key_t key;
- snat_det_map_t *dm;
- snat_det_session_t *ses;
- int rv = 0;
-
- if (!sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
- clib_memcpy (&out_addr, mp->out_addr, 4);
- clib_memcpy (&ext_addr, mp->ext_addr, 4);
-
- dm = snat_det_map_by_out (sm, &out_addr);
- if (!dm)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
- snat_det_reverse (dm, &ext_addr, ntohs (mp->out_port), &in_addr);
- key.ext_host_addr = ext_addr;
- key.ext_host_port = mp->ext_port;
- key.out_port = mp->out_port;
- ses = snat_det_get_ses_by_out (dm, &in_addr, key.as_u64);
- if (!ses)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
- snat_det_ses_close (dm, ses);
-
-send_reply:
- REPLY_MACRO (VL_API_NAT_DET_CLOSE_SESSION_OUT_REPLY);
-}
-
-static void *
-vl_api_nat_det_close_session_out_t_print (vl_api_nat_det_close_session_out_t *
- mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat_det_close_session_out ");
- s = format (s, "out_addr %U out_port %d "
- "ext_addr %U ext_port %d\n",
- format_ip4_address, mp->out_addr, ntohs (mp->out_port),
- format_ip4_address, mp->ext_addr, ntohs (mp->ext_port));
-
- FINISH;
-}
-
-static void
-vl_api_nat_det_close_session_in_t_handler (vl_api_nat_det_close_session_in_t *
- mp)
-{
- snat_main_t *sm = &snat_main;
- vl_api_nat_det_close_session_in_reply_t *rmp;
- ip4_address_t in_addr, ext_addr;
- snat_det_out_key_t key;
- snat_det_map_t *dm;
- snat_det_session_t *ses;
- int rv = 0;
-
- if (!sm->deterministic)
- {
- rv = VNET_API_ERROR_UNSUPPORTED;
- goto send_reply;
- }
-
- clib_memcpy (&in_addr, mp->in_addr, 4);
- clib_memcpy (&ext_addr, mp->ext_addr, 4);
-
- dm = snat_det_map_by_user (sm, &in_addr);
- if (!dm)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
- key.ext_host_addr = ext_addr;
- key.ext_host_port = mp->ext_port;
- ses = snat_det_find_ses_by_in (dm, &in_addr, mp->in_port, key);
- if (!ses)
- {
- rv = VNET_API_ERROR_NO_SUCH_ENTRY;
- goto send_reply;
- }
- snat_det_ses_close (dm, ses);
-
-send_reply:
- REPLY_MACRO (VL_API_NAT_DET_CLOSE_SESSION_OUT_REPLY);
-}
-
-static void *
-vl_api_nat_det_close_session_in_t_print (vl_api_nat_det_close_session_in_t *
- mp, void *handle)
-{
- u8 *s;
- s = format (0, "SCRIPT: nat_det_close_session_in ");
- s = format (s, "in_addr %U in_port %d ext_addr %U ext_port %d\n",
- format_ip4_address, mp->in_addr, ntohs (mp->in_port),
- format_ip4_address, mp->ext_addr, ntohs (mp->ext_port));
-
- FINISH;
-}
-
-static void
-send_nat_det_session_details (snat_det_session_t * s,
- vl_api_registration_t * reg, u32 context)
-{
- vl_api_nat_det_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_NAT_DET_SESSION_DETAILS + sm->msg_id_base);
- rmp->in_port = s->in_port;
- clib_memcpy (rmp->ext_addr, &s->out.ext_host_addr, 4);
- rmp->ext_port = s->out.ext_host_port;
- rmp->out_port = s->out.out_port;
- rmp->state = s->state;
- rmp->expire = ntohl (s->expire);
- rmp->context = context;
-
- vl_api_send_msg (reg, (u8 *) rmp);
-}
-
-static void
-vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp)
-{
- vl_api_registration_t *reg;
- snat_main_t *sm = &snat_main;
- ip4_address_t user_addr;
- snat_det_map_t *dm;
- snat_det_session_t *s, empty_ses;
- u16 i;
-
- if (!sm->deterministic)
- return;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- clib_memset (&empty_ses, 0, sizeof (empty_ses));
- clib_memcpy (&user_addr, mp->user_addr, 4);
- dm = snat_det_map_by_user (sm, &user_addr);
- if (!dm)
- return;
-
- s = dm->sessions + snat_det_user_ses_offset (&user_addr, dm->in_plen);
- for (i = 0; i < SNAT_DET_SES_PER_USER; i++)
- {
- if (s->out.as_u64)
- send_nat_det_session_details (s, reg, mp->context);
- s++;
- }
-}
-
-static void *
-vl_api_nat_det_session_dump_t_print (vl_api_nat_det_session_dump_t * mp,
- void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat_det_session_dump ");
- s = format (s, "user_addr %U\n", format_ip4_address, mp->user_addr);
-
- FINISH;
-}
-
-/*************/
-/*** NAT64 ***/
-/*************/
-
-static void
- vl_api_nat64_add_del_pool_addr_range_t_handler
- (vl_api_nat64_add_del_pool_addr_range_t * mp)
-{
- vl_api_nat64_add_del_pool_addr_range_reply_t *rmp;
- snat_main_t *sm = &snat_main;
- int rv = 0;
- ip4_address_t this_addr;
- u32 start_host_order, end_host_order;
- u32 vrf_id;
- 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;
-
- vrf_id = clib_host_to_net_u32 (mp->vrf_id);
-
- memcpy (&this_addr.as_u8, mp->start_addr, 4);
-
- for (i = 0; i < count; i++)
- {
- if ((rv = nat64_add_del_pool_addr (0, &this_addr, vrf_id, mp->is_add)))
- goto send_reply;
-
- increment_v4_address (&this_addr);
- }
-
-send_reply:
- REPLY_MACRO (VL_API_NAT64_ADD_DEL_POOL_ADDR_RANGE_REPLY);
-}
-
-static void *vl_api_nat64_add_del_pool_addr_range_t_print
- (vl_api_nat64_add_del_pool_addr_range_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_add_del_pool_addr_range ");
- s = format (s, "%U - %U vrf_id %u %s\n",
- format_ip4_address, mp->start_addr,
- format_ip4_address, mp->end_addr,
- ntohl (mp->vrf_id), mp->is_add ? "" : "del");
-
- FINISH;
-}
-
-typedef struct nat64_api_walk_ctx_t_
-{
- vl_api_registration_t *reg;
- u32 context;
- nat64_db_t *db;
-} nat64_api_walk_ctx_t;
-
-static int
-nat64_api_pool_walk (snat_address_t * a, void *arg)
-{
- vl_api_nat64_pool_addr_details_t *rmp;
- snat_main_t *sm = &snat_main;
- nat64_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_NAT64_POOL_ADDR_DETAILS + sm->msg_id_base);
- clib_memcpy (rmp->address, &(a->addr), 4);
- if (a->fib_index != ~0)
- {
- fib_table_t *fib = fib_table_get (a->fib_index, FIB_PROTOCOL_IP6);
- if (!fib)
- return -1;
- rmp->vrf_id = ntohl (fib->ft_table_id);
- }
- else
- rmp->vrf_id = ~0;
- rmp->context = ctx->context;
-
- vl_api_send_msg (ctx->reg, (u8 *) rmp);
-
- return 0;
-}
-
-static void
-vl_api_nat64_pool_addr_dump_t_handler (vl_api_nat64_pool_addr_dump_t * mp)
-{
- vl_api_registration_t *reg;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- nat64_api_walk_ctx_t ctx = {
- .reg = reg,
- .context = mp->context,
- };
-
- nat64_pool_addr_walk (nat64_api_pool_walk, &ctx);
-}
-
-static void *
-vl_api_nat64_pool_addr_dump_t_print (vl_api_nat64_pool_addr_dump_t * mp,
- void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_pool_addr_dump\n");
-
- FINISH;
-}
-
-static void
-vl_api_nat64_add_del_interface_t_handler (vl_api_nat64_add_del_interface_t *
- mp)
-{
- snat_main_t *sm = &snat_main;
- vl_api_nat64_add_del_interface_reply_t *rmp;
- int rv = 0;
-
- VALIDATE_SW_IF_INDEX (mp);
-
- rv =
- nat64_add_del_interface (ntohl (mp->sw_if_index),
- mp->flags & NAT_API_IS_INSIDE, mp->is_add);
-
- BAD_SW_IF_INDEX_LABEL;
-
- REPLY_MACRO (VL_API_NAT64_ADD_DEL_INTERFACE_REPLY);
-}
-
-static void *
-vl_api_nat64_add_del_interface_t_print (vl_api_nat64_add_del_interface_t * mp,
- void *handle)
-{
- u8 *s;
-
- 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->flags & NAT_API_IS_INSIDE ? "in" : "out",
- mp->is_add ? "" : "del");
-
- FINISH;
-}
-
-static int
-nat64_api_interface_walk (snat_interface_t * i, void *arg)
-{
- vl_api_nat64_interface_details_t *rmp;
- snat_main_t *sm = &snat_main;
- nat64_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_NAT64_INTERFACE_DETAILS + sm->msg_id_base);
- rmp->sw_if_index = ntohl (i->sw_if_index);
-
- 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);
-
- return 0;
-}
-
-static void
-vl_api_nat64_interface_dump_t_handler (vl_api_nat64_interface_dump_t * mp)
-{
- vl_api_registration_t *reg;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- nat64_api_walk_ctx_t ctx = {
- .reg = reg,
- .context = mp->context,
- };
-
- nat64_interfaces_walk (nat64_api_interface_walk, &ctx);
-}
-
-static void *
-vl_api_nat64_interface_dump_t_print (vl_api_nat64_interface_dump_t * mp,
- void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: snat_interface_dump ");
-
- FINISH;
-}
-
-static void
- vl_api_nat64_add_del_static_bib_t_handler
- (vl_api_nat64_add_del_static_bib_t * mp)
-{
- snat_main_t *sm = &snat_main;
- vl_api_nat64_add_del_static_bib_reply_t *rmp;
- ip6_address_t in_addr;
- ip4_address_t out_addr;
- int rv = 0;
-
- memcpy (&in_addr.as_u8, mp->i_addr, 16);
- memcpy (&out_addr.as_u8, mp->o_addr, 4);
-
- rv =
- nat64_add_del_static_bib_entry (&in_addr, &out_addr,
- clib_net_to_host_u16 (mp->i_port),
- clib_net_to_host_u16 (mp->o_port),
- mp->proto,
- clib_net_to_host_u32 (mp->vrf_id),
- mp->is_add);
-
- REPLY_MACRO (VL_API_NAT64_ADD_DEL_STATIC_BIB_REPLY);
-}
-
-static void *vl_api_nat64_add_del_static_bib_t_print
- (vl_api_nat64_add_del_static_bib_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_add_del_static_bib ");
- s = format (s, "protocol %d i_addr %U o_addr %U ",
- mp->proto,
- format_ip6_address, mp->i_addr, format_ip4_address, mp->o_addr);
-
- if (mp->vrf_id != ~0)
- s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
-
- FINISH;
-}
-
-static int
-nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg)
-{
- vl_api_nat64_bib_details_t *rmp;
- snat_main_t *sm = &snat_main;
- nat64_api_walk_ctx_t *ctx = arg;
- fib_table_t *fib;
-
- fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
- if (!fib)
- return -1;
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- clib_memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs (VL_API_NAT64_BIB_DETAILS + sm->msg_id_base);
- rmp->context = ctx->context;
- clib_memcpy (rmp->i_addr, &(bibe->in_addr), 16);
- clib_memcpy (rmp->o_addr, &(bibe->out_addr), 4);
- rmp->i_port = bibe->in_port;
- rmp->o_port = bibe->out_port;
- rmp->vrf_id = ntohl (fib->ft_table_id);
- rmp->proto = bibe->proto;
- 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);
-
- return 0;
-}
-
-static void
-vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp)
-{
- vl_api_registration_t *reg;
- nat64_main_t *nm = &nat64_main;
- nat64_db_t *db;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- nat64_api_walk_ctx_t ctx = {
- .reg = reg,
- .context = mp->context,
- };
-
- /* *INDENT-OFF* */
- vec_foreach (db, nm->db)
- nat64_db_bib_walk (db, mp->proto, nat64_api_bib_walk, &ctx);
- /* *INDENT-ON* */
-}
-
-static void *
-vl_api_nat64_bib_dump_t_print (vl_api_nat64_bib_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: snat_bib_dump protocol %d", mp->proto);
-
- FINISH;
-}
-
-static int
-nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
-{
- vl_api_nat64_st_details_t *rmp;
+ vl_api_nat64_interface_details_t *rmp;
snat_main_t *sm = &snat_main;
nat64_api_walk_ctx_t *ctx = arg;
- nat64_db_bib_entry_t *bibe;
- fib_table_t *fib;
-
- bibe = nat64_db_bib_entry_by_index (ctx->db, ste->proto, ste->bibe_index);
- if (!bibe)
- return -1;
-
- fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
- if (!fib)
- return -1;
rmp = vl_msg_api_alloc (sizeof (*rmp));
clib_memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs (VL_API_NAT64_ST_DETAILS + sm->msg_id_base);
- rmp->context = ctx->context;
- clib_memcpy (rmp->il_addr, &(bibe->in_addr), 16);
- clib_memcpy (rmp->ol_addr, &(bibe->out_addr), 4);
- rmp->il_port = bibe->in_port;
- rmp->ol_port = bibe->out_port;
- clib_memcpy (rmp->ir_addr, &(ste->in_r_addr), 16);
- clib_memcpy (rmp->or_addr, &(ste->out_r_addr), 4);
- rmp->il_port = ste->r_port;
- rmp->vrf_id = ntohl (fib->ft_table_id);
- rmp->proto = ste->proto;
-
- vl_api_send_msg (ctx->reg, (u8 *) rmp);
-
- return 0;
-}
-
-static void
-vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp)
-{
- vl_api_registration_t *reg;
- nat64_main_t *nm = &nat64_main;
- nat64_db_t *db;
-
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- nat64_api_walk_ctx_t ctx = {
- .reg = reg,
- .context = mp->context,
- };
-
- /* *INDENT-OFF* */
- vec_foreach (db, nm->db)
- {
- ctx.db = db;
- nat64_db_st_walk (db, mp->proto, nat64_api_st_walk, &ctx);
- }
- /* *INDENT-ON* */
-}
-
-static void *
-vl_api_nat64_st_dump_t_print (vl_api_nat64_st_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: snat_st_dump protocol %d", mp->proto);
-
- FINISH;
-}
-
-static void
-vl_api_nat64_add_del_prefix_t_handler (vl_api_nat64_add_del_prefix_t * mp)
-{
- vl_api_nat64_add_del_prefix_reply_t *rmp;
- snat_main_t *sm = &snat_main;
- ip6_address_t prefix;
- int rv = 0;
-
- memcpy (&prefix.as_u8, mp->prefix.prefix, 16);
-
- rv =
- 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);
-}
-
-static void *
-vl_api_nat64_add_del_prefix_t_print (vl_api_nat64_add_del_prefix_t * mp,
- void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_add_del_prefix %U/%u vrf_id %u %s\n",
- format_ip6_address, mp->prefix.prefix, mp->prefix.len,
- ntohl (mp->vrf_id), mp->is_add ? "" : "del");
-
- FINISH;
-}
+ rmp->_vl_msg_id = ntohs (VL_API_NAT64_INTERFACE_DETAILS + sm->msg_id_base);
+ rmp->sw_if_index = ntohl (i->sw_if_index);
-static int
-nat64_api_prefix_walk (nat64_prefix_t * p, void *arg)
-{
- vl_api_nat64_prefix_details_t *rmp;
- snat_main_t *sm = &snat_main;
- nat64_api_walk_ctx_t *ctx = arg;
+ 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 = 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.prefix, &(p->prefix), 16);
- rmp->prefix.len = p->plen;
- rmp->vrf_id = ntohl (p->vrf_id);
rmp->context = ctx->context;
vl_api_send_msg (ctx->reg, (u8 *) rmp);
}
static void
-vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_dump_t * mp)
+vl_api_nat64_interface_dump_t_handler (vl_api_nat64_interface_dump_t * mp)
{
vl_api_registration_t *reg;
- reg = vl_api_client_index_to_registration (mp->client_index);
- if (!reg)
- return;
-
- nat64_api_walk_ctx_t ctx = {
- .reg = reg,
- .context = mp->context,
- };
-
- nat64_prefix_walk (nat64_api_prefix_walk, &ctx);
-}
-
-static void *
-vl_api_nat64_prefix_dump_t_print (vl_api_nat64_prefix_dump_t * mp,
- void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_prefix_dump\n");
-
- FINISH;
-}
-
-static void
- vl_api_nat64_add_del_interface_addr_t_handler
- (vl_api_nat64_add_del_interface_addr_t * mp)
-{
- snat_main_t *sm = &snat_main;
- vl_api_nat64_add_del_interface_addr_reply_t *rmp;
- u32 sw_if_index = ntohl (mp->sw_if_index);
- int rv = 0;
-
- VALIDATE_SW_IF_INDEX (mp);
-
- rv = nat64_add_interface_address (sw_if_index, mp->is_add);
-
- BAD_SW_IF_INDEX_LABEL;
-
- REPLY_MACRO (VL_API_NAT64_ADD_DEL_INTERFACE_ADDR_REPLY);
-}
-
-static void *vl_api_nat64_add_del_interface_addr_t_print
- (vl_api_nat64_add_del_interface_addr_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: nat64_add_del_interface_addr ");
- s = format (s, "sw_if_index %d %s",
- clib_host_to_net_u32 (mp->sw_if_index),
- mp->is_add ? "" : "del");
-
- 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);
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
- rv = dslite_set_b4_ip6_addr (dm, &ip6_addr);
- if (rv == 0)
- rv = dslite_set_b4_ip4_addr (dm, &ip4_addr);
+ nat64_api_walk_ctx_t ctx = {
+ .reg = reg,
+ .context = mp->context,
+ };
- REPLY_MACRO (VL_API_DSLITE_SET_B4_ADDR_REPLY);
+ nat64_interfaces_walk (nat64_api_interface_walk, &ctx);
}
static void *
-vl_api_dslite_set_b4_addr_t_print (vl_api_dslite_set_b4_addr_t * mp,
- void *handle)
+vl_api_nat64_interface_dump_t_print (vl_api_nat64_interface_dump_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);
+ s = format (0, "SCRIPT: snat_interface_dump ");
FINISH;
}
static void
-vl_api_dslite_get_b4_addr_t_handler (vl_api_dslite_get_b4_addr_t * mp)
+ vl_api_nat64_add_del_static_bib_t_handler
+ (vl_api_nat64_add_del_static_bib_t * mp)
{
snat_main_t *sm = &snat_main;
- vl_api_dslite_get_b4_addr_reply_t *rmp;
- dslite_main_t *dm = &dslite_main;
+ vl_api_nat64_add_del_static_bib_reply_t *rmp;
+ ip6_address_t in_addr;
+ ip4_address_t out_addr;
int rv = 0;
- /* *INDENT-OFF* */
- REPLY_MACRO2 (VL_API_DSLITE_GET_B4_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;
+ memcpy (&in_addr.as_u8, mp->i_addr, 16);
+ memcpy (&out_addr.as_u8, mp->o_addr, 4);
- s = format (0, "SCRIPT: dslite_get_b4_addr");
+ rv =
+ nat64_add_del_static_bib_entry (&in_addr, &out_addr,
+ clib_net_to_host_u16 (mp->i_port),
+ clib_net_to_host_u16 (mp->o_port),
+ mp->proto,
+ clib_net_to_host_u32 (mp->vrf_id),
+ mp->is_add);
- FINISH;
+ REPLY_MACRO (VL_API_NAT64_ADD_DEL_STATIC_BIB_REPLY);
}
-static void
- vl_api_dslite_add_del_pool_addr_range_t_handler
- (vl_api_dslite_add_del_pool_addr_range_t * mp)
+static void *vl_api_nat64_add_del_static_bib_t_print
+ (vl_api_nat64_add_del_static_bib_t * mp, void *handle)
{
- 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);
+ u8 *s;
- for (i = 0; i < count; i++)
- {
- if ((rv = dslite_add_del_pool_addr (dm, &this_addr, mp->is_add)))
- goto send_reply;
+ s = format (0, "SCRIPT: nat64_add_del_static_bib ");
+ s = format (s, "protocol %d i_addr %U o_addr %U ",
+ mp->proto,
+ format_ip6_address, mp->i_addr, format_ip4_address, mp->o_addr);
- increment_v4_address (&this_addr);
- }
+ if (mp->vrf_id != ~0)
+ s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
-send_reply:
- REPLY_MACRO (VL_API_DSLITE_ADD_DEL_POOL_ADDR_RANGE_REPLY);
+ FINISH;
}
-static void
-send_dslite_address_details (snat_address_t * ap,
- vl_api_registration_t * reg, u32 context)
+static int
+nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg)
{
- vl_api_dslite_address_details_t *rmp;
+ vl_api_nat64_bib_details_t *rmp;
snat_main_t *sm = &snat_main;
+ nat64_api_walk_ctx_t *ctx = arg;
+ fib_table_t *fib;
- rmp = vl_msg_api_alloc (sizeof (*rmp));
+ fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
+ if (!fib)
+ return -1;
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
clib_memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs (VL_API_NAT64_BIB_DETAILS + sm->msg_id_base);
+ rmp->context = ctx->context;
+ clib_memcpy (rmp->i_addr, &(bibe->in_addr), 16);
+ clib_memcpy (rmp->o_addr, &(bibe->out_addr), 4);
+ rmp->i_port = bibe->in_port;
+ rmp->o_port = bibe->out_port;
+ rmp->vrf_id = ntohl (fib->ft_table_id);
+ rmp->proto = bibe->proto;
+ if (bibe->is_static)
+ rmp->flags |= NAT_API_IS_STATIC;
+ rmp->ses_num = ntohl (bibe->ses_num);
- 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 (ctx->reg, (u8 *) rmp);
- vl_api_send_msg (reg, (u8 *) rmp);
+ return 0;
}
static void
-vl_api_dslite_address_dump_t_handler (vl_api_dslite_address_dump_t * mp)
+vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp)
{
vl_api_registration_t *reg;
- dslite_main_t *dm = &dslite_main;
- snat_address_t *ap;
+ nat64_main_t *nm = &nat64_main;
+ nat64_db_t *db;
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
+ nat64_api_walk_ctx_t ctx = {
+ .reg = reg,
+ .context = mp->context,
+ };
+
/* *INDENT-OFF* */
- vec_foreach (ap, dm->addr_pool)
- {
- send_dslite_address_details (ap, reg, mp->context);
- }
+ vec_foreach (db, nm->db)
+ nat64_db_bib_walk (db, mp->proto, nat64_api_bib_walk, &ctx);
/* *INDENT-ON* */
}
static void *
-vl_api_dslite_address_dump_t_print (vl_api_dslite_address_dump_t * mp,
- void *handle)
+vl_api_nat64_bib_dump_t_print (vl_api_nat64_bib_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: dslite_address_dump ");
+ s = format (0, "SCRIPT: snat_bib_dump protocol %d", mp->proto);
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)
+static int
+nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
{
- u8 *s;
+ vl_api_nat64_st_details_t *rmp;
+ snat_main_t *sm = &snat_main;
+ nat64_api_walk_ctx_t *ctx = arg;
+ nat64_db_bib_entry_t *bibe;
+ fib_table_t *fib;
- 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);
+ bibe = nat64_db_bib_entry_by_index (ctx->db, ste->proto, ste->bibe_index);
+ if (!bibe)
+ return -1;
- FINISH;
-}
+ fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
+ if (!fib)
+ return -1;
+
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs (VL_API_NAT64_ST_DETAILS + sm->msg_id_base);
+ rmp->context = ctx->context;
+ clib_memcpy (rmp->il_addr, &(bibe->in_addr), 16);
+ clib_memcpy (rmp->ol_addr, &(bibe->out_addr), 4);
+ rmp->il_port = bibe->in_port;
+ rmp->ol_port = bibe->out_port;
+ clib_memcpy (rmp->ir_addr, &(ste->in_r_addr), 16);
+ clib_memcpy (rmp->or_addr, &(ste->out_r_addr), 4);
+ rmp->il_port = ste->r_port;
+ rmp->vrf_id = ntohl (fib->ft_table_id);
+ rmp->proto = ste->proto;
+ vl_api_send_msg (ctx->reg, (u8 *) rmp);
-/*************/
-/*** NAT66 ***/
-/*************/
+ return 0;
+}
static void
-vl_api_nat66_add_del_interface_t_handler (vl_api_nat66_add_del_interface_t *
- mp)
+vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp)
{
- snat_main_t *sm = &snat_main;
- vl_api_nat66_add_del_interface_reply_t *rmp;
- int rv = 0;
-
- VALIDATE_SW_IF_INDEX (mp);
+ vl_api_registration_t *reg;
+ nat64_main_t *nm = &nat64_main;
+ nat64_db_t *db;
- rv =
- nat66_interface_add_del (ntohl (mp->sw_if_index),
- mp->flags & NAT_API_IS_INSIDE, mp->is_add);
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
- BAD_SW_IF_INDEX_LABEL;
+ nat64_api_walk_ctx_t ctx = {
+ .reg = reg,
+ .context = mp->context,
+ };
- REPLY_MACRO (VL_API_NAT66_ADD_DEL_INTERFACE_REPLY);
+ /* *INDENT-OFF* */
+ vec_foreach (db, nm->db)
+ {
+ ctx.db = db;
+ nat64_db_st_walk (db, mp->proto, nat64_api_st_walk, &ctx);
+ }
+ /* *INDENT-ON* */
}
static void *
-vl_api_nat66_add_del_interface_t_print (vl_api_nat66_add_del_interface_t * mp,
- void *handle)
+vl_api_nat64_st_dump_t_print (vl_api_nat64_st_dump_t * mp, void *handle)
{
u8 *s;
- 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->flags & NAT_API_IS_INSIDE ? "in" : "out",
- mp->is_add ? "" : "del");
+ s = format (0, "SCRIPT: snat_st_dump protocol %d", mp->proto);
FINISH;
}
static void
- vl_api_nat66_add_del_static_mapping_t_handler
- (vl_api_nat66_add_del_static_mapping_t * mp)
+vl_api_nat64_add_del_prefix_t_handler (vl_api_nat64_add_del_prefix_t * mp)
{
+ vl_api_nat64_add_del_prefix_reply_t *rmp;
snat_main_t *sm = &snat_main;
- vl_api_nat66_add_del_static_mapping_reply_t *rmp;
- ip6_address_t l_addr, e_addr;
+ ip6_address_t prefix;
int rv = 0;
- memcpy (&l_addr.as_u8, mp->local_ip_address, 16);
- memcpy (&e_addr.as_u8, mp->external_ip_address, 16);
+ memcpy (&prefix.as_u8, mp->prefix.address, 16);
rv =
- nat66_static_mapping_add_del (&l_addr, &e_addr,
- clib_net_to_host_u32 (mp->vrf_id),
- mp->is_add);
-
- REPLY_MACRO (VL_API_NAT66_ADD_DEL_STATIC_MAPPING_REPLY);
+ 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);
}
-static void *vl_api_nat66_add_del_static_mapping_t_print
- (vl_api_nat66_add_del_static_mapping_t * mp, void *handle)
+static void *
+vl_api_nat64_add_del_prefix_t_print (vl_api_nat64_add_del_prefix_t * mp,
+ void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat66_add_del_static_mapping ");
- s = format (s, "local_ip_address %U external_ip_address %U vrf_id %d %s",
- format_ip6_address, mp->local_ip_address,
- format_ip6_address, mp->external_ip_address,
- clib_net_to_host_u32 (mp->vrf_id), mp->is_add ? "" : "del");
+ s = format (0, "SCRIPT: nat64_add_del_prefix %U/%u vrf_id %u %s\n",
+ format_ip6_address, mp->prefix.address, mp->prefix.len,
+ ntohl (mp->vrf_id), mp->is_add ? "" : "del");
FINISH;
}
-typedef struct nat66_api_walk_ctx_t_
-{
- vl_api_registration_t *rp;
- u32 context;
-} nat66_api_walk_ctx_t;
-
static int
-nat66_api_interface_walk (snat_interface_t * i, void *arg)
+nat64_api_prefix_walk (nat64_prefix_t * p, void *arg)
{
- vl_api_nat66_interface_details_t *rmp;
+ vl_api_nat64_prefix_details_t *rmp;
snat_main_t *sm = &snat_main;
- nat66_api_walk_ctx_t *ctx = arg;
+ nat64_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_NAT66_INTERFACE_DETAILS + sm->msg_id_base);
- rmp->sw_if_index = ntohl (i->sw_if_index);
- if (nat_interface_is_inside (i))
- rmp->flags |= NAT_API_IS_INSIDE;
+ rmp->_vl_msg_id = ntohs (VL_API_NAT64_PREFIX_DETAILS + sm->msg_id_base);
+ clib_memcpy (rmp->prefix.address, &(p->prefix), 16);
+ rmp->prefix.len = p->plen;
+ rmp->vrf_id = ntohl (p->vrf_id);
rmp->context = ctx->context;
- vl_api_send_msg (ctx->rp, (u8 *) rmp);
+ vl_api_send_msg (ctx->reg, (u8 *) rmp);
return 0;
}
static void
-vl_api_nat66_interface_dump_t_handler (vl_api_nat66_interface_dump_t * mp)
+vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_dump_t * mp)
{
- vl_api_registration_t *rp;
+ vl_api_registration_t *reg;
- rp = vl_api_client_index_to_registration (mp->client_index);
- if (rp == 0)
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
return;
- nat66_api_walk_ctx_t ctx = {
- .rp = rp,
+ nat64_api_walk_ctx_t ctx = {
+ .reg = reg,
.context = mp->context,
};
- nat66_interfaces_walk (nat66_api_interface_walk, &ctx);
+ nat64_prefix_walk (nat64_api_prefix_walk, &ctx);
}
static void *
-vl_api_nat66_interface_dump_t_print (vl_api_nat66_interface_dump_t * mp,
- void *handle)
+vl_api_nat64_prefix_dump_t_print (vl_api_nat64_prefix_dump_t * mp,
+ void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat66_interface_dump ");
+ s = format (0, "SCRIPT: nat64_prefix_dump\n");
FINISH;
}
-static int
-nat66_api_static_mapping_walk (nat66_static_mapping_t * m, void *arg)
+static void
+ vl_api_nat64_add_del_interface_addr_t_handler
+ (vl_api_nat64_add_del_interface_addr_t * mp)
{
- vl_api_nat66_static_mapping_details_t *rmp;
- nat66_main_t *nm = &nat66_main;
snat_main_t *sm = &snat_main;
- nat66_api_walk_ctx_t *ctx = arg;
- fib_table_t *fib;
- vlib_counter_t vc;
-
- fib = fib_table_get (m->fib_index, FIB_PROTOCOL_IP6);
- if (!fib)
- return -1;
-
- vlib_get_combined_counter (&nm->session_counters, m - nm->sm, &vc);
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- clib_memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id =
- ntohs (VL_API_NAT66_STATIC_MAPPING_DETAILS + sm->msg_id_base);
- clib_memcpy (rmp->local_ip_address, &m->l_addr, 16);
- clib_memcpy (rmp->external_ip_address, &m->e_addr, 16);
- rmp->vrf_id = ntohl (fib->ft_table_id);
- rmp->total_bytes = clib_host_to_net_u64 (vc.bytes);
- rmp->total_pkts = clib_host_to_net_u64 (vc.packets);
- rmp->context = ctx->context;
-
- vl_api_send_msg (ctx->rp, (u8 *) rmp);
-
- return 0;
-}
+ vl_api_nat64_add_del_interface_addr_reply_t *rmp;
+ u32 sw_if_index = ntohl (mp->sw_if_index);
+ int rv = 0;
-static void
-vl_api_nat66_static_mapping_dump_t_handler (vl_api_nat66_static_mapping_dump_t
- * mp)
-{
- vl_api_registration_t *rp;
+ VALIDATE_SW_IF_INDEX (mp);
- rp = vl_api_client_index_to_registration (mp->client_index);
- if (rp == 0)
- return;
+ rv = nat64_add_interface_address (sw_if_index, mp->is_add);
- nat66_api_walk_ctx_t ctx = {
- .rp = rp,
- .context = mp->context,
- };
+ BAD_SW_IF_INDEX_LABEL;
- nat66_static_mappings_walk (nat66_api_static_mapping_walk, &ctx);
+ REPLY_MACRO (VL_API_NAT64_ADD_DEL_INTERFACE_ADDR_REPLY);
}
-static void *
-vl_api_nat66_static_mapping_dump_t_print (vl_api_nat66_static_mapping_dump_t *
- mp, void *handle)
+static void *vl_api_nat64_add_del_interface_addr_t_print
+ (vl_api_nat64_add_del_interface_addr_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: nat66_static_mapping_dump ");
+ s = format (0, "SCRIPT: nat64_add_del_interface_addr ");
+ s = format (s, "sw_if_index %d %s",
+ clib_host_to_net_u32 (mp->sw_if_index),
+ mp->is_add ? "" : "del");
FINISH;
}
-
/* List of message types that this plugin understands */
#define foreach_snat_plugin_api_msg \
_(NAT_CONTROL_PING, nat_control_ping) \
_(NAT_SHOW_CONFIG, nat_show_config) \
+_(NAT_SHOW_CONFIG_2, nat_show_config_2) \
_(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) \
_(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) \
+_(NAT44_ADD_DEL_STATIC_MAPPING_V2, nat44_add_del_static_mapping_v2) \
_(NAT44_ADD_DEL_IDENTITY_MAPPING, nat44_add_del_identity_mapping) \
_(NAT44_STATIC_MAPPING_DUMP, nat44_static_mapping_dump) \
_(NAT44_IDENTITY_MAPPING_DUMP, nat44_identity_mapping_dump) \
_(NAT44_DEL_SESSION, nat44_del_session) \
_(NAT44_FORWARDING_ENABLE_DISABLE, nat44_forwarding_enable_disable) \
_(NAT44_FORWARDING_IS_ENABLED, nat44_forwarding_is_enabled) \
-_(NAT_DET_ADD_DEL_MAP, nat_det_add_del_map) \
-_(NAT_DET_FORWARD, nat_det_forward) \
-_(NAT_DET_REVERSE, nat_det_reverse) \
-_(NAT_DET_MAP_DUMP, nat_det_map_dump) \
-_(NAT_DET_CLOSE_SESSION_OUT, nat_det_close_session_out) \
-_(NAT_DET_CLOSE_SESSION_IN, nat_det_close_session_in) \
-_(NAT_DET_SESSION_DUMP, nat_det_session_dump) \
_(NAT64_ADD_DEL_POOL_ADDR_RANGE, nat64_add_del_pool_addr_range) \
_(NAT64_POOL_ADDR_DUMP, nat64_pool_addr_dump) \
_(NAT64_ADD_DEL_INTERFACE, nat64_add_del_interface) \
_(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) \
-_(NAT66_STATIC_MAPPING_DUMP, nat66_static_mapping_dump)
+_(NAT64_ADD_DEL_INTERFACE_ADDR, nat64_add_del_interface_addr)
/* Set up the API message handling tables */
static clib_error_t *
Code Review / vpp.git / blobdiff