Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: NAT44-ED api fix and improvement
[vpp.git]
/
src
/
plugins
/
nat
/
nat44-ed
/
nat44_ed_api.c
diff --git
a/src/plugins/nat/nat44-ed/nat44_ed_api.c
b/src/plugins/nat/nat44-ed/nat44_ed_api.c
index
759cfd3
..
1505975
100644
(file)
--- a/
src/plugins/nat/nat44-ed/nat44_ed_api.c
+++ b/
src/plugins/nat/nat44-ed/nat44_ed_api.c
@@
-840,10
+840,12
@@
send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m,
rmp->vrf_id = htonl (m->vrf_id);
rmp->context = context;
rmp->vrf_id = htonl (m->vrf_id);
rmp->context = context;
- if (m->twice_nat)
- rmp->flags |= NAT_API_IS_TWICE_NAT;
+ if (is_sm_twice_nat (m->flags))
+ {
+ rmp->flags |= NAT_API_IS_TWICE_NAT;
+ }
- if (
m->addr_only
)
+ if (
is_sm_addr_only (m->flags)
)
{
rmp->flags |= NAT_API_IS_ADDR_ONLY;
}
{
rmp->flags |= NAT_API_IS_ADDR_ONLY;
}
@@
-853,6
+855,7
@@
send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m,
rmp->external_port = m->e_port;
rmp->local_port = m->l_port;
}
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));
if (m->tag)
strncpy ((char *) rmp->tag, (char *) m->tag, vec_len (m->tag));
@@
-882,7
+885,7
@@
vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t
for (j = 0; j < vec_len (sm->to_resolve); j++)
{
rp = sm->to_resolve + j;
for (j = 0; j < vec_len (sm->to_resolve); j++)
{
rp = sm->to_resolve + j;
- if (!
rp->identity_nat
)
+ if (!
is_sm_identity_nat (rp->flags)
)
send_nat44_static_map_resolve_details (rp, reg, mp->context);
}
}
send_nat44_static_map_resolve_details (rp, reg, mp->context);
}
}
@@
-985,7
+988,7
@@
send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m,
rmp->_vl_msg_id =
ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
rmp->_vl_msg_id =
ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
- if (
m->addr_only
)
+ if (
is_sm_addr_only (m->flags)
)
rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_ADDR_ONLY;
rmp->port = m->l_port;
rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_ADDR_ONLY;
rmp->port = m->l_port;
@@
-1027,7
+1030,7
@@
static void
for (j = 0; j < vec_len (sm->to_resolve); j++)
{
rp = sm->to_resolve + j;
for (j = 0; j < vec_len (sm->to_resolve); j++)
{
rp = sm->to_resolve + j;
- if (
rp->identity_nat
)
+ if (
is_sm_identity_nat (rp->flags)
)
send_nat44_identity_map_resolve_details (rp, reg, mp->context);
}
}
send_nat44_identity_map_resolve_details (rp, reg, mp->context);
}
}