summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2018-01-31 01:13:23 -0800
committerMatus Fabian <matfabia@cisco.com>2018-01-31 01:13:23 -0800
commit9dba7816f6c3b5e4c879f839bb4bc61dcdbde757 (patch)
tree681ae6bedfbebdb5fcafcd8389866452cfb98dd8
parent8ad6a2dfed0a7248be9d005dd04c76da142f2238 (diff)
NAT44: nat44_static_mapping_details protocol=0 if addr_only=0 (VPP-1158)
Change-Id: I1e3cfc751e7657464fc850dc56ddf763df45f62e Signed-off-by: Matus Fabian <matfabia@cisco.com>
-rw-r--r--src/plugins/nat/nat.api14
-rw-r--r--src/plugins/nat/nat_api.c18
-rw-r--r--test/test_nat.py3
3 files changed, 22 insertions, 13 deletions
diff --git a/src/plugins/nat/nat.api b/src/plugins/nat/nat.api
index 6bb08018966..ce565f6b9b5 100644
--- a/src/plugins/nat/nat.api
+++ b/src/plugins/nat/nat.api
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-option version = "2.4.0";
+option version = "2.4.1";
/**
* @file nat.api
@@ -343,9 +343,9 @@ define nat44_interface_output_feature_details {
@param addr_only - 1 if address only mapping
@param local_ip_address - local IPv4 address
@param external_ip_address - external IPv4 address
- @param protocol - IP protocol
- @param local_port - local port number
- @param external_port - external port number
+ @param protocol - IP protocol, used only if addr_only=0
+ @param local_port - local port number, used only if addr_only=0
+ @param external_port - external port number, used only if addr_only=0
@param external_sw_if_index - external interface (if set
external_ip_address is ignored, ~0 means not
used)
@@ -386,9 +386,9 @@ define nat44_static_mapping_dump {
@param addr_only - 1 if address only mapping
@param local_ip_address - local IPv4 address
@param external_ip_address - external IPv4 address
- @param protocol - IP protocol
- @param local_port - local port number
- @param external_port - external port number
+ @param protocol - IP protocol, valid only if addr_only=0
+ @param local_port - local port number, valid only if addr_only=0
+ @param external_port - external port number, valid only if addr_only=0
@param external_sw_if_index - external interface
@param vfr_id - VRF ID
@param twice_nat - if 1 translate external host address and port
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index 3cb7399558f..2fefb8b7c1b 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -764,14 +764,17 @@ send_nat44_static_mapping_details (snat_static_mapping_t * m,
rmp->addr_only = m->addr_only;
clib_memcpy (rmp->local_ip_address, &(m->local_addr), 4);
clib_memcpy (rmp->external_ip_address, &(m->external_addr), 4);
- rmp->local_port = htons (m->local_port);
- rmp->external_port = htons (m->external_port);
rmp->external_sw_if_index = ~0;
rmp->vrf_id = htonl (m->vrf_id);
- rmp->protocol = snat_proto_to_ip_proto (m->proto);
rmp->context = context;
rmp->twice_nat = m->twice_nat;
rmp->out2in_only = m->out2in_only;
+ if (m->addr_only == 0)
+ {
+ rmp->protocol = snat_proto_to_ip_proto (m->proto);
+ rmp->external_port = htons (m->external_port);
+ rmp->local_port = htons (m->local_port);
+ }
if (m->tag)
strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
@@ -792,13 +795,16 @@ send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m,
ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base);
rmp->addr_only = m->addr_only;
clib_memcpy (rmp->local_ip_address, &(m->l_addr), 4);
- rmp->local_port = htons (m->l_port);
- rmp->external_port = htons (m->e_port);
rmp->external_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->context = context;
rmp->twice_nat = m->twice_nat;
+ if (m->addr_only == 0)
+ {
+ rmp->protocol = snat_proto_to_ip_proto (m->proto);
+ rmp->external_port = htons (m->e_port);
+ rmp->local_port = htons (m->l_port);
+ }
if (m->tag)
strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
diff --git a/test/test_nat.py b/test/test_nat.py
index b9785f01c7a..6aff932c024 100644
--- a/test/test_nat.py
+++ b/test/test_nat.py
@@ -1383,6 +1383,9 @@ class TestNAT44(MethodHolder):
sm = self.vapi.nat44_static_mapping_dump()
self.assertEqual(len(sm), 1)
self.assertEqual((sm[0].tag).split('\0', 1)[0], '')
+ self.assertEqual(sm[0].protocol, 0)
+ self.assertEqual(sm[0].local_port, 0)
+ self.assertEqual(sm[0].external_port, 0)
# in2out
pkts = self.create_stream_in(self.pg0, self.pg1)