#include <vppinfra/error.h>
#include <vnet/ip/ip.h>
+#define __plugin_msg_base snat_test_main.msg_id_base
+#include <vlibapi/vat_helper_macros.h>
+
uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
/* Declare message IDs */
_(SNAT_IPFIX_ENABLE_DISABLE_REPLY, \
snat_ipfix_enable_disable_reply)
-/* M: construct, but don't yet send a message */
-#define M(T,t) \
-do { \
- vam->result_ready = 0; \
- mp = vl_msg_api_alloc(sizeof(*mp)); \
- memset (mp, 0, sizeof (*mp)); \
- mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base); \
- mp->client_index = vam->my_client_index; \
-} while(0);
-
-#define M2(T,t,n) \
-do { \
- vam->result_ready = 0; \
- mp = vl_msg_api_alloc(sizeof(*mp)+(n)); \
- memset (mp, 0, sizeof (*mp)); \
- mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base); \
- mp->client_index = vam->my_client_index; \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W \
-do { \
- timeout = vat_time_now (vam) + 1.0; \
- \
- while (vat_time_now (vam) < timeout) { \
- if (vam->result_ready == 1) { \
- return (vam->retval); \
- } \
- } \
- return -99; \
-} while(0);
-
static int api_snat_add_address_range (vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
ip4_address_t start_addr, end_addr;
u32 start_host_order, end_host_order;
vl_api_snat_add_address_range_t * mp;
u8 is_add = 1;
int count;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
count);
}
- M(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range);
+ M(SNAT_ADD_ADDRESS_RANGE, mp);
memcpy (mp->first_ip_address, &start_addr, 4);
memcpy (mp->last_ip_address, &end_addr, 4);
mp->is_ip4 = 1;
mp->is_add = is_add;
- S; W;
-
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
static int api_snat_interface_add_del_feature (vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_snat_interface_add_del_feature_t * mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
u8 is_inside = 1;
u8 is_add = 1;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return -99;
}
- M(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature);
+ M(SNAT_INTERFACE_ADD_DEL_FEATURE, mp);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
mp->is_inside = is_inside;
- S; W;
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
static int api_snat_add_static_mapping(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_snat_add_static_mapping_t * mp;
- u8 addr_set_n = 0;
+ u8 external_addr_set = 0;
+ u8 local_addr_set = 0;
u8 is_add = 1;
u8 addr_only = 1;
ip4_address_t local_addr, external_addr;
u32 local_port = 0, external_port = 0, vrf_id = ~0;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ u32 proto = ~0;
+ u8 proto_set = 0;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "local_addr %U", unformat_ip4_address, &local_addr))
- addr_set_n++;
+ local_addr_set = 1;
else if (unformat (i, "external_addr %U", unformat_ip4_address,
&external_addr))
- addr_set_n++;
+ external_addr_set = 1;
else if (unformat (i, "local_port %u", &local_port))
addr_only = 0;
else if (unformat (i, "external_port %u", &external_port))
addr_only = 0;
+ else if (unformat (i, "external_if %U", unformat_sw_if_index, vam,
+ &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "external_sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else if (unformat (i, "vrf %u", &vrf_id))
;
+ else if (unformat (i, "protocol %u", &proto))
+ proto_set = 1;
else if (unformat (i, "del"))
is_add = 0;
else
}
}
- if (addr_set_n != 2)
+ if (!addr_only && !proto_set)
+ {
+ errmsg ("protocol required\n");
+ return -99;
+ }
+
+ if (!local_addr_set)
+ {
+ errmsg ("local addr required\n");
+ return -99;
+ }
+ if (!external_addr_set && !sw_if_index_set)
{
- errmsg ("local_addr and remote_addr required\n");
+ errmsg ("external addr or interface required\n");
return -99;
}
- M(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping);
+ M(SNAT_ADD_STATIC_MAPPING, mp);
mp->is_add = is_add;
mp->is_ip4 = 1;
mp->addr_only = addr_only;
mp->local_port = ntohs ((u16) local_port);
mp->external_port = ntohs ((u16) external_port);
+ mp->external_sw_if_index = ntohl (sw_if_index);
mp->vrf_id = ntohl (vrf_id);
+ mp->protocol = (u8) proto;
memcpy (mp->local_ip_address, &local_addr, 4);
memcpy (mp->external_ip_address, &external_addr, 4);
- S; W;
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
static void vl_api_snat_control_ping_reply_t_handler
snat_test_main_t * sm = &snat_test_main;
vat_main_t *vam = sm->vat_main;
- if (mp->addr_only)
- fformat (vam->ofp, "%15U%6s%15U%6s%11d\n",
+ if (mp->addr_only && mp->external_sw_if_index != ~0)
+ fformat (vam->ofp, "%15U%6s%15d%6s%11d%6d\n",
+ format_ip4_address, &mp->local_ip_address, "",
+ ntohl (mp->external_sw_if_index), "",
+ ntohl (mp->vrf_id),
+ mp->protocol);
+ else if (mp->addr_only && mp->external_sw_if_index == ~0)
+ fformat (vam->ofp, "%15U%6s%15U%6s%11d%6d\n",
format_ip4_address, &mp->local_ip_address, "",
format_ip4_address, &mp->external_ip_address, "",
- ntohl (mp->vrf_id));
+ ntohl (mp->vrf_id),
+ mp->protocol);
+ else if (!mp->addr_only && mp->external_sw_if_index != ~0)
+ fformat (vam->ofp, "%15U%6d%15d%6d%11d%6d\n",
+ format_ip4_address, &mp->local_ip_address,
+ ntohs (mp->local_port),
+ ntohl (mp->external_sw_if_index),
+ ntohs (mp->external_port),
+ ntohl (mp->vrf_id),
+ mp->protocol);
else
- fformat (vam->ofp, "%15U%6d%15U%6d%11d\n",
+ fformat (vam->ofp, "%15U%6d%15U%6d%11d%6d\n",
format_ip4_address, &mp->local_ip_address,
ntohs (mp->local_port),
format_ip4_address, &mp->external_ip_address,
ntohs (mp->external_port),
- ntohl (mp->vrf_id));
+ ntohl (mp->vrf_id),
+ mp->protocol);
}
static int api_snat_static_mapping_dump(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_static_mapping_dump_t * mp;
+ vl_api_snat_control_ping_t *mp_ping;
+ int ret;
if (vam->json_output)
{
}
fformat (vam->ofp, "%21s%21s\n", "local", "external");
- fformat (vam->ofp, "%15s%6s%15s%6s%11s\n", "address", "port", "address",
- "port", "vrf");
+ fformat (vam->ofp, "%15s%6s%15s%6s%11s%6s\n", "address", "port",
+ "address/if_idx", "port", "vrf", "proto");
+
+ M(SNAT_STATIC_MAPPING_DUMP, mp);
+ S(mp);
- M(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump);
- S;
/* Use a control ping for synchronization */
- {
- vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_CONTROL_PING, mp_ping);
+ S(mp_ping);
+
+ W (ret);
+ return ret;
}
static void vl_api_snat_show_config_reply_t_handler
static int api_snat_show_config(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_show_config_t * mp;
+ int ret;
if (vam->json_output)
{
return -99;
}
- M(SNAT_SHOW_CONFIG, snat_show_config);
- S; W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_SHOW_CONFIG, mp);
+ S(mp);
+ W (ret);
+ return ret;
}
static void vl_api_snat_address_details_t_handler
static int api_snat_address_dump(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_address_dump_t * mp;
+ vl_api_snat_control_ping_t *mp_ping;
+ int ret;
if (vam->json_output)
{
return -99;
}
- M(SNAT_ADDRESS_DUMP, snat_address_dump);
- S;
+ M(SNAT_ADDRESS_DUMP, mp);
+ S(mp);
+
/* Use a control ping for synchronization */
- {
- vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_CONTROL_PING, mp_ping);
+ S(mp_ping);
+
+ W (ret);
+ return ret;
}
static void vl_api_snat_interface_details_t_handler
static int api_snat_interface_dump(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_interface_dump_t * mp;
+ vl_api_snat_control_ping_t *mp_ping;
+ int ret;
if (vam->json_output)
{
return -99;
}
- M(SNAT_INTERFACE_DUMP, snat_interface_dump);
- S;
+ M(SNAT_INTERFACE_DUMP, mp);
+ S(mp);
+
/* Use a control ping for synchronization */
- {
- vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_CONTROL_PING, mp_ping);
+ S(mp_ping);
+
+ W (ret);
+ return ret;
}
static int api_snat_set_workers (vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_snat_set_workers_t * mp;
uword *bitmap;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
}
- M(SNAT_SET_WORKERS, snat_set_workers);
+ M(SNAT_SET_WORKERS, mp);
mp->worker_mask = clib_host_to_net_u64 (bitmap[0]);
- S; W;
-
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
static void vl_api_snat_worker_details_t_handler
static int api_snat_worker_dump(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_worker_dump_t * mp;
+ vl_api_snat_control_ping_t *mp_ping;
+ int ret;
if (vam->json_output)
{
return -99;
}
- M(SNAT_WORKER_DUMP, snat_worker_dump);
- S;
+ M(SNAT_WORKER_DUMP, mp);
+ S(mp);
+
/* Use a control ping for synchronization */
- {
- vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_CONTROL_PING, mp_ping);
+ S(mp_ping);
+
+ W (ret);
+ return ret;
}
-static int api_snat_ipfix_enable_disable (vat_main_t * vam)
+static int api_snat_add_del_interface_addr (vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_snat_add_del_interface_addr_t * mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
u8 is_add = 1;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return -99;
}
- M(SNAT_ADD_DEL_INTERFACE_ADDR, snat_add_del_interface_addr);
+ M(SNAT_ADD_DEL_INTERFACE_ADDR, mp);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
- S; W;
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
static void vl_api_snat_interface_addr_details_t_handler
static int api_snat_interface_addr_dump(vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
- f64 timeout;
vl_api_snat_interface_addr_dump_t * mp;
+ vl_api_snat_control_ping_t *mp_ping;
+ int ret;
if (vam->json_output)
{
return -99;
}
- M(SNAT_INTERFACE_ADDR_DUMP, snat_interface_addr_dump);
- S;
+ M(SNAT_INTERFACE_ADDR_DUMP, mp);
+ S(mp);
+
/* Use a control ping for synchronization */
- {
- vl_api_snat_control_ping_t *mp;
- M (SNAT_CONTROL_PING, snat_control_ping);
- S;
- }
- W;
- /* NOTREACHED */
- return 0;
+ M(SNAT_CONTROL_PING, mp_ping);
+ S(mp_ping);
+
+ W (ret);
+ return ret;
}
-static int api_snat_add_del_interface_addr (vat_main_t * vam)
+static int api_snat_ipfix_enable_disable (vat_main_t * vam)
{
- snat_test_main_t * sm = &snat_test_main;
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_snat_ipfix_enable_disable_t * mp;
u32 domain_id = 0;
u32 src_port = 0;
u8 enable = 1;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
}
- M(SNAT_IPFIX_ENABLE_DISABLE, snat_ipfix_enable_disable);
+ M(SNAT_IPFIX_ENABLE_DISABLE, mp);
mp->domain_id = htonl(domain_id);
mp->src_port = htons((u16) src_port);
mp->enable = enable;
- S; W;
- /* NOTREACHED */
- return 0;
+ S(mp);
+ W (ret);
+ return ret;
}
/*
_(snat_add_address_range, "<start-addr> [- <end-addr] [del]") \
_(snat_interface_add_del_feature, \
"<intfc> | sw_if_index <id> [in] [out] [del]") \
-_(snat_add_static_mapping, "local_addr <ip> external_addr <ip> " \
- "[local_port <n>] [external_port <n>] [vrf <table-id>] [del]") \
+_(snat_add_static_mapping, "local_addr <ip> (external_addr <ip>" \
+ " | external_if <intfc> | external_sw_if_ndex <id>) " \
+ "[local_port <n>] [external_port <n>] [vrf <table-id>] [del] " \
+ "protocol <n>") \
_(snat_set_workers, "<wokrers_bitmap>") \
_(snat_static_mapping_dump, "") \
_(snat_show_config, "") \
_(snat_ipfix_enable_disable, "[domain <id>] [src_port <n>] " \
"[disable]")
-void vat_api_hookup (vat_main_t *vam)
+static void
+snat_vat_api_hookup (vat_main_t *vam)
{
snat_test_main_t * sm __attribute__((unused)) = &snat_test_main;
/* Hook up handlers for replies from the data plane plug-in */
#undef _
/* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+#define _(n,h) \
+ hash_set_mem (vam->function_by_name, #n, api_##n); \
+ clib_warning ("vam %llx add '%s' handler %llx", vam, #n, api_##n);
foreach_vpe_api_msg;
#undef _
sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
if (sm->msg_id_base != (u16) ~0)
- vat_api_hookup (vam);
+ snat_vat_api_hookup (vam);
vec_free(name);
Code Review / vpp.git / blobdiff