*/
#include <nat/nat.h>
-#include <nat/nat64.h>
#include <nat/nat_inlines.h>
#include <nat/nat44/inlines.h>
+#include <nat/lib/nat_inlines.h>
#include <nat/nat_ha.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.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>
+#include <nat/lib/ipfix_logging.h>
#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;
- nat64_main_t *n64m = &nat64_main;
int rv = 0;
/* *INDENT-OFF* */
REPLY_MACRO2 (VL_API_NAT_SHOW_CONFIG_REPLY,
({
rmp->translation_buckets = htonl (sm->translation_buckets);
- rmp->translation_memory_size = clib_host_to_net_u64 (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 = clib_host_to_net_u64 (sm->user_memory_size);
rmp->max_translations_per_user = htonl (sm->max_translations_per_user);
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);
+ // these are obsolete
+ rmp->dslite_ce = 0;
+ rmp->deterministic = 0;
+ rmp->nat64_bib_buckets = 0;
+ rmp->nat64_bib_memory_size = 0;
+ rmp->nat64_st_buckets = 0;
+ rmp->nat64_st_memory_size = 0;
}));
/* *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;
+ 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->endpoint_dependent = sm->endpoint_dependent;
+ rmp->out2in_dpo = sm->out2in_dpo;
+ 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);
+ // these are obsolete
+ rmp->dslite_ce = 0;
+ rmp->deterministic = 0;
+ rmp->nat64_bib_buckets = 0;
+ rmp->nat64_bib_memory_size = 0;
+ rmp->nat64_st_buckets = 0;
+ rmp->nat64_st_memory_size = 0;
+ }));
+ /* *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)
{
vl_api_nat_ipfix_enable_disable_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 = nat_ipfix_logging_enable_disable (mp->enable,
+ clib_host_to_net_u32
+ (mp->domain_id),
+ clib_host_to_net_u16 (mp->src_port));
REPLY_MACRO (VL_API_NAT_IPFIX_ENABLE_DISABLE_REPLY);
}
sm->tcp_transitory_timeout = ntohl (mp->tcp_transitory);
sm->icmp_timeout = ntohl (mp->icmp);
- rv = nat64_set_icmp_timeout (ntohl (mp->icmp));
- if (rv)
- goto send_reply;
- rv = nat64_set_udp_timeout (ntohl (mp->udp));
- if (rv)
- goto send_reply;
- rv =
- nat64_set_tcp_timeouts (ntohl (mp->tcp_transitory),
- ntohl (mp->tcp_established));
-
-send_reply:
REPLY_MACRO (VL_API_NAT_SET_TIMEOUTS_REPLY);
}
{
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;
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, 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 = 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_nat_proto (mp->protocol);
+
+ if (mp->flags & NAT_API_IS_TWICE_NAT)
+ twice_nat = TWICE_NAT;
+ else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT)
+ twice_nat = TWICE_NAT_SELF;
+ mp->tag[sizeof (mp->tag) - 1] = 0;
+ tag = format (0, "%s", mp->tag);
+ vec_terminate_c_string (tag);
+
+ rv = snat_add_static_mapping (local_addr, external_addr, local_port,
+ external_port, vrf_id,
+ mp->flags & NAT_API_IS_ADDR_ONLY,
+ external_sw_if_index, proto,
+ mp->is_add, twice_nat,
+ mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, 0,
+ pool_addr, mp->match_pool);
+ vec_free (tag);
+
+ REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_V2_REPLY);
+}
+
static void *vl_api_nat44_add_del_static_mapping_t_print
(vl_api_nat44_add_del_static_mapping_t * mp, void *handle)
{
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;
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;
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);
REPLY_MACRO (VL_API_NAT44_ADD_DEL_IDENTITY_MAPPING_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),
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;
- 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.address, 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.address, mp->prefix.len,
- ntohl (mp->vrf_id), mp->is_add ? "" : "del");
-
- FINISH;
-}
-
-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;
-
- 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.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->reg, (u8 *) rmp);
-
- return 0;
-}
-
-static void
-vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_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;
-}
-
/* 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_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_LB_STATIC_MAPPING_DUMP, nat44_lb_static_mapping_dump) \
_(NAT44_DEL_SESSION, nat44_del_session) \
_(NAT44_FORWARDING_ENABLE_DISABLE, nat44_forwarding_enable_disable) \
-_(NAT44_FORWARDING_IS_ENABLED, nat44_forwarding_is_enabled) \
-_(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_INTERFACE_DUMP, nat64_interface_dump) \
-_(NAT64_ADD_DEL_STATIC_BIB, nat64_add_del_static_bib) \
-_(NAT64_BIB_DUMP, nat64_bib_dump) \
-_(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)
+_(NAT44_FORWARDING_IS_ENABLED, nat44_forwarding_is_enabled)
/* Set up the API message handling tables */
static clib_error_t *
Code Review / vpp.git / blobdiff