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: refactor and split fo EI/ED features
[vpp.git]
/
src
/
plugins
/
nat
/
nat44_api.c
diff --git
a/src/plugins/nat/nat44_api.c
b/src/plugins/nat/nat44_api.c
index
5bc4b4c
..
cfe2211
100644
(file)
--- a/
src/plugins/nat/nat44_api.c
+++ b/
src/plugins/nat/nat44_api.c
@@
-31,7
+31,8
@@
#include <nat/nat44.api_enum.h>
#include <nat/nat44.api_types.h>
#include <nat/nat44.api_enum.h>
#include <nat/nat44.api_types.h>
-#include <nat/nat_ha.h>
+#include <nat/nat44-ei/nat44_ei_ha.h>
+#include <nat/nat44-ei/nat44_ei.h>
#include <nat/nat_inlines.h>
#include <nat/nat44/inlines.h>
#include <nat/nat_inlines.h>
#include <nat/nat44/inlines.h>
@@
-350,11
+351,11
@@
static void
switch (mp->alg)
{
case NAT_ADDR_AND_PORT_ALLOC_ALG_DEFAULT:
switch (mp->alg)
{
case NAT_ADDR_AND_PORT_ALLOC_ALG_DEFAULT:
- nat
_set_alloc_addr_and_port
_default ();
+ nat
44_ei_set_alloc
_default ();
break;
case NAT_ADDR_AND_PORT_ALLOC_ALG_MAPE:
break;
case NAT_ADDR_AND_PORT_ALLOC_ALG_MAPE:
- nat
_set_alloc_addr_and_port
_mape (ntohs (mp->psid), mp->psid_offset,
-
mp->psid_length);
+ nat
44_ei_set_alloc
_mape (ntohs (mp->psid), mp->psid_offset,
+ mp->psid_length);
break;
case NAT_ADDR_AND_PORT_ALLOC_ALG_RANGE:
port_start = ntohs (mp->start_port);
break;
case NAT_ADDR_AND_PORT_ALLOC_ALG_RANGE:
port_start = ntohs (mp->start_port);
@@
-364,7
+365,7
@@
static void
rv = VNET_API_ERROR_INVALID_VALUE;
goto send_reply;
}
rv = VNET_API_ERROR_INVALID_VALUE;
goto send_reply;
}
- nat
_set_alloc_addr_and_port
_range (port_start, port_end);
+ nat
44_ei_set_alloc
_range (port_start, port_end);
break;
default:
rv = VNET_API_ERROR_INVALID_VALUE;
break;
default:
rv = VNET_API_ERROR_INVALID_VALUE;