#define foreach_standard_reply_retval_handler \
_(nat44_add_del_address_range_reply) \
_(nat44_interface_add_del_feature_reply) \
+_(nat44_interface_add_del_output_feature_reply) \
_(nat44_add_del_static_mapping_reply) \
_(nat_set_workers_reply) \
_(nat44_add_del_interface_addr_reply) \
_(nat_ipfix_enable_disable_reply) \
_(nat_det_add_del_map_reply) \
-_(nat_det_set_timeouts_reply) \
+_(nat_set_timeouts_reply) \
_(nat_det_close_session_out_reply) \
_(nat_det_close_session_in_reply)
nat44_add_del_address_range_reply) \
_(NAT44_INTERFACE_ADD_DEL_FEATURE_REPLY, \
nat44_interface_add_del_feature_reply) \
+_(NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE_REPLY, \
+ nat44_interface_add_del_output_feature_reply) \
_(NAT44_ADD_DEL_STATIC_MAPPING_REPLY, \
nat44_add_del_static_mapping_reply) \
_(NAT_CONTROL_PING_REPLY, nat_control_ping_reply) \
_(NAT_DET_FORWARD_REPLY, nat_det_forward_reply) \
_(NAT_DET_REVERSE_REPLY, nat_det_reverse_reply) \
_(NAT_DET_MAP_DETAILS, nat_det_map_details) \
-_(NAT_DET_SET_TIMEOUTS_REPLY, nat_det_set_timeouts_reply) \
-_(NAT_DET_GET_TIMEOUTS_REPLY, nat_det_get_timeouts_reply) \
+_(NAT_SET_TIMEOUTS_REPLY, nat_set_timeouts_reply) \
+_(NAT_GET_TIMEOUTS_REPLY, nat_get_timeouts_reply) \
_(NAT_DET_CLOSE_SESSION_OUT_REPLY, \
nat_det_close_session_out_reply) \
_(NAT_DET_CLOSE_SESSION_IN_REPLY, \
u32 start_host_order, end_host_order;
vl_api_nat44_add_del_address_range_t * mp;
u8 is_add = 1;
+ u8 twice_nat = 0;
+ int vrf_id = ~0;
int count;
int ret;
;
else if (unformat (i, "%U", unformat_ip4_address, &start_addr))
end_addr = start_addr;
+ else if (unformat (i, "twice-nat"))
+ twice_nat = 1;
+ else if (unformat (i, "vrf %u", &vrf_id))
+ ;
else if (unformat (i, "del"))
is_add = 0;
else
memcpy (mp->first_ip_address, &start_addr, 4);
memcpy (mp->last_ip_address, &end_addr, 4);
+ mp->vrf_id = vrf_id;
+ if (twice_nat)
+ mp->flags = (vl_api_nat_config_flags_t)NAT_API_IS_TWICE_NAT;
mp->is_add = is_add;
S(mp);
M(NAT44_INTERFACE_ADD_DEL_FEATURE, mp);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
- mp->is_inside = is_inside;
+ if (is_inside)
+ mp->flags |= NAT_API_IS_INSIDE;
+
+ S(mp);
+ W (ret);
+ return ret;
+}
+
+static int api_nat44_interface_add_del_output_feature (vat_main_t * vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_nat44_interface_add_del_output_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)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "out"))
+ is_inside = 0;
+ else if (unformat (i, "in"))
+ is_inside = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning("unknown input '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("interface / sw_if_index required\n");
+ return -99;
+ }
+
+ M(NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE, mp);
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->is_add = is_add;
+ if (is_inside)
+ mp->flags |= NAT_API_IS_INSIDE;
S(mp);
W (ret);
}
M(NAT44_ADD_DEL_STATIC_MAPPING, mp);
+
mp->is_add = is_add;
- mp->addr_only = addr_only;
+ if (addr_only)
+ mp->flags |= NAT_API_IS_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);
{
snat_test_main_t * sm = &snat_test_main;
vat_main_t *vam = sm->vat_main;
+ nat_config_flags_t flags = (nat_config_flags_t) mp->flags;
- if (mp->addr_only && mp->external_sw_if_index != ~0)
+ if (flags & NAT_API_IS_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)
+ else if (flags & NAT_API_IS_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),
mp->protocol);
- else if (!mp->addr_only && mp->external_sw_if_index != ~0)
+ else if (!(flags & NAT_API_IS_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),
static void vl_api_nat44_interface_details_t_handler
(vl_api_nat44_interface_details_t *mp)
{
+ nat_config_flags_t flags = (nat_config_flags_t) mp->flags;
snat_test_main_t * sm = &snat_test_main;
vat_main_t *vam = sm->vat_main;
- fformat (vam->ofp, "sw_if_index %d %s\n", ntohl (mp->sw_if_index),
- mp->is_inside ? "in" : "out");
+ if ((flags & NAT_API_IS_INSIDE) && (flags & NAT_API_IS_OUTSIDE))
+ {
+ fformat (vam->ofp, "sw_if_index %d in & out\n", ntohl (mp->sw_if_index));
+ }
+ else
+ {
+ fformat (vam->ofp, "sw_if_index %d %s\n", ntohl (mp->sw_if_index),
+ flags & NAT_API_IS_INSIDE ? "in" : "out");
+ }
}
static int api_nat44_interface_dump(vat_main_t * vam)
u32 sw_if_index;
u8 sw_if_index_set = 0;
u8 is_add = 1;
+ u8 twice_nat = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
+ else if (unformat (i, "twice-nat"))
+ twice_nat = 1;
else if (unformat (i, "del"))
is_add = 0;
else
M(NAT44_ADD_DEL_INTERFACE_ADDR, mp);
mp->sw_if_index = ntohl(sw_if_index);
+ if (twice_nat)
+ mp->flags = (vl_api_nat_config_flags_t)NAT_API_IS_TWICE_NAT;
mp->is_add = is_add;
S(mp);
fformat(vam->ofp, "%s session %U:%d to %U:%d protocol id %d "
"total packets %d total bytes %lld\n",
- mp->is_static ? "static" : "dynamic",
+ mp->flags & NAT_API_IS_STATIC ? "static" : "dynamic",
format_ip4_address, mp->inside_ip_address, ntohs(mp->inside_port),
format_ip4_address, mp->outside_ip_address, ntohs(mp->outside_port),
ntohs(mp->protocol), ntohl(mp->total_pkts),
/* Use a control ping for synchronization */
M(NAT_CONTROL_PING, mp_ping);
- memset(mp->ip_address, 0, 16);
+ clib_memset(mp->ip_address, 0, 16);
clib_memcpy(mp->ip_address, &addr, 4);
mp->vrf_id = htonl(vrf_id);
S(mp_ping);
return ret;
}
-static int api_nat_det_set_timeouts (vat_main_t * vam)
+static int api_nat_set_timeouts (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_nat_det_set_timeouts_t * mp;
+ vl_api_nat_set_timeouts_t * mp;
u32 udp = SNAT_UDP_TIMEOUT;
u32 tcp_established = SNAT_TCP_ESTABLISHED_TIMEOUT;
u32 tcp_transitory = SNAT_TCP_TRANSITORY_TIMEOUT;
return -99;
}
- M(NAT_DET_SET_TIMEOUTS, mp);
+ M(NAT_SET_TIMEOUTS, mp);
mp->udp = htonl(udp);
mp->tcp_established = htonl(tcp_established);
mp->tcp_transitory = htonl(tcp_transitory);
return ret;
}
-static void vl_api_nat_det_get_timeouts_reply_t_handler
- (vl_api_nat_det_get_timeouts_reply_t *mp)
+static void vl_api_nat_get_timeouts_reply_t_handler
+ (vl_api_nat_get_timeouts_reply_t *mp)
{
snat_test_main_t * sm = &snat_test_main;
vat_main_t *vam = sm->vat_main;
vam->result_ready = 1;
}
-static int api_nat_det_get_timeouts(vat_main_t * vam)
+static int api_nat_get_timeouts(vat_main_t * vam)
{
- vl_api_nat_det_get_timeouts_t * mp;
+ vl_api_nat_get_timeouts_t * mp;
int ret;
if (vam->json_output)
{
- clib_warning ("JSON output not supported for nat_show_config");
+ clib_warning ("JSON output not supported for nat_get_timeouts");
return -99;
}
- M(NAT_DET_GET_TIMEOUTS, mp);
+ M(NAT_GET_TIMEOUTS, mp);
S(mp);
W (ret);
return ret;
* and that the data plane plugin processes
*/
#define foreach_vpe_api_msg \
-_(nat44_add_del_address_range, "<start-addr> [- <end-addr] [del]")\
+_(nat44_add_del_address_range, \
+ "<start-addr> [- <end-addr>] [vrf <table-id>] [twice-nat] [del]") \
_(nat44_interface_add_del_feature, \
"<intfc> | sw_if_index <id> [in] [out] [del]") \
+_(nat44_interface_add_del_output_feature, \
+ "<intfc> | sw_if_index <id> [in] [out] [del]") \
_(nat44_add_del_static_mapping, "local_addr <ip>" \
" (external_addr <ip> | external_if <intfc> |" \
" external_sw_if_ndex <id>) [local_port <n>]" \
_(nat44_interface_dump, "") \
_(nat_worker_dump, "") \
_(nat44_add_del_interface_addr, \
- "<intfc> | sw_if_index <id> [del]") \
+ "<intfc> | sw_if_index <id> [twice-nat] [del]") \
_(nat44_interface_addr_dump, "") \
_(nat_ipfix_enable_disable, "[domain <id>] [src_port <n>] " \
"[disable]") \
_(nat_det_forward, "<in_addr>") \
_(nat_det_reverse, "<out_addr> <out_port>") \
_(nat_det_map_dump, "") \
-_(nat_det_set_timeouts, "[udp <sec> | tcp_established <sec> | " \
+_(nat_set_timeouts, "[udp <sec> | tcp_established <sec> | " \
"tcp_transitory <sec> | icmp <sec>]") \
-_(nat_det_get_timeouts, "") \
+_(nat_get_timeouts, "") \
_(nat_det_close_session_out, "<out_addr>:<out_port> " \
"<ext_addr>:<ext_port>") \
_(nat_det_close_session_in, "<in_addr>:<in_port> " \
/* Ask the vpp engine for the first assigned message-id */
name = format (0, "nat_%08x%c", api_version, 0);
sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+ vec_free(name);
if (sm->msg_id_base != (u16) ~0)
snat_vat_api_hookup (vam);
-
- vec_free(name);
+ else
+ return clib_error_return (0, "nat plugin not loaded...");
return 0;
}
Code Review / vpp.git / blobdiff