aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2020-09-10 16:55:57 +0300
committerPetri Savolainen <petri.savolainen@nokia.com>2020-09-28 10:06:37 +0300
commit6e24d8da43d4780372df9cb9d77ff35cdd065cf6 (patch)
treea5cc6cda0af1c309ba3a271d6d442ea5f040ce04
parentd8b151feb38ae04da1a195742b8160442c2a62cd (diff)
example: ipsec_crypto: rename ipsec application to ipsec_crypto
Rename ipsec application to ipsec_crypto to better distinguish it from the ipsec api example. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Janne Peltonen <janne.peltonen@nokia.com>
-rw-r--r--doc/application-api-guide/examples.dox10
-rw-r--r--example/Makefile.am2
-rw-r--r--example/ipsec/.gitignore1
l---------example/ipsec_api/odp_ipsec_fwd_db.c2
l---------example/ipsec_api/odp_ipsec_fwd_db.h2
l---------example/ipsec_api/odp_ipsec_misc.h2
l---------example/ipsec_api/odp_ipsec_sa_db.c2
l---------example/ipsec_api/odp_ipsec_sa_db.h2
l---------example/ipsec_api/odp_ipsec_sp_db.c2
l---------example/ipsec_api/odp_ipsec_sp_db.h2
l---------example/ipsec_api/odp_ipsec_stream.c2
l---------example/ipsec_api/odp_ipsec_stream.h2
-rw-r--r--example/ipsec_crypto/.gitignore1
-rw-r--r--example/ipsec_crypto/Makefile.am (renamed from example/ipsec/Makefile.am)47
-rw-r--r--example/ipsec_crypto/README (renamed from example/ipsec/README)20
-rw-r--r--example/ipsec_crypto/odp_ipsec.c (renamed from example/ipsec/odp_ipsec.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_cache.c (renamed from example/ipsec/odp_ipsec_cache.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_cache.h (renamed from example/ipsec/odp_ipsec_cache.h)0
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_ah_in.sh (renamed from example/ipsec/odp_ipsec_run_ah_in.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_ah_out.sh (renamed from example/ipsec/odp_ipsec_run_ah_out.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_both_in.sh (renamed from example/ipsec/odp_ipsec_run_both_in.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_both_out.sh (renamed from example/ipsec/odp_ipsec_run_both_out.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_esp_in.sh (renamed from example/ipsec/odp_ipsec_run_esp_in.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_esp_out.sh (renamed from example/ipsec/odp_ipsec_run_esp_out.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_live.sh (renamed from example/ipsec/odp_ipsec_run_live.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_router.sh (renamed from example/ipsec/odp_ipsec_run_router.sh)2
-rwxr-xr-xexample/ipsec_crypto/odp_ipsec_crypto_run_simple.sh (renamed from example/ipsec/odp_ipsec_run_simple.sh)2
-rw-r--r--example/ipsec_crypto/odp_ipsec_fwd_db.c (renamed from example/ipsec/odp_ipsec_fwd_db.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_fwd_db.h (renamed from example/ipsec/odp_ipsec_fwd_db.h)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_misc.h (renamed from example/ipsec/odp_ipsec_misc.h)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_sa_db.c (renamed from example/ipsec/odp_ipsec_sa_db.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_sa_db.h (renamed from example/ipsec/odp_ipsec_sa_db.h)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_sp_db.c (renamed from example/ipsec/odp_ipsec_sp_db.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_sp_db.h (renamed from example/ipsec/odp_ipsec_sp_db.h)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_stream.c (renamed from example/ipsec/odp_ipsec_stream.c)0
-rw-r--r--example/ipsec_crypto/odp_ipsec_stream.h (renamed from example/ipsec/odp_ipsec_stream.h)0
-rw-r--r--example/m4/configure.m42
-rw-r--r--platform/linux-generic/test/Makefile.am4
-rwxr-xr-xplatform/linux-generic/test/ipsec/ipsec_crypto_example.sh (renamed from platform/linux-generic/test/ipsec/ipsec_example.sh)8
39 files changed, 67 insertions, 64 deletions
diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox
index ba686f295..a45c3127e 100644
--- a/doc/application-api-guide/examples.dox
+++ b/doc/application-api-guide/examples.dox
@@ -29,16 +29,16 @@
* IPv4 lock-free fragmentation and reassembly example application
*/
- /**
- * @example ipsec/odp_ipsec.c
- * IPsec example application using crypto API
- */
-
/**
* @example ipsec_api/odp_ipsec.c
* IPsec example application using IPsec API
*/
+ /**
+ * @example ipsec_crypto/odp_ipsec.c
+ * IPsec example application using crypto API
+ */
+
/**
* @example ipsec_offload/odp_ipsec_offload.c
* IPsec offload example application
diff --git a/example/Makefile.am b/example/Makefile.am
index 174dea6dd..02ef55faf 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = classifier \
debug \
generator \
hello \
- ipsec \
ipsec_api \
+ ipsec_crypto \
ipsec_offload \
l2fwd_simple \
l3fwd \
diff --git a/example/ipsec/.gitignore b/example/ipsec/.gitignore
deleted file mode 100644
index 5b410d31b..000000000
--- a/example/ipsec/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-odp_ipsec
diff --git a/example/ipsec_api/odp_ipsec_fwd_db.c b/example/ipsec_api/odp_ipsec_fwd_db.c
index 63b0d36d6..aba996aaf 120000
--- a/example/ipsec_api/odp_ipsec_fwd_db.c
+++ b/example/ipsec_api/odp_ipsec_fwd_db.c
@@ -1 +1 @@
-../ipsec/odp_ipsec_fwd_db.c \ No newline at end of file
+../ipsec_crypto/odp_ipsec_fwd_db.c \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_fwd_db.h b/example/ipsec_api/odp_ipsec_fwd_db.h
index 5a709f212..f9a8ab957 120000
--- a/example/ipsec_api/odp_ipsec_fwd_db.h
+++ b/example/ipsec_api/odp_ipsec_fwd_db.h
@@ -1 +1 @@
-../ipsec/odp_ipsec_fwd_db.h \ No newline at end of file
+../ipsec_crypto/odp_ipsec_fwd_db.h \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_misc.h b/example/ipsec_api/odp_ipsec_misc.h
index f1de214a4..7bb7de030 120000
--- a/example/ipsec_api/odp_ipsec_misc.h
+++ b/example/ipsec_api/odp_ipsec_misc.h
@@ -1 +1 @@
-../ipsec/odp_ipsec_misc.h \ No newline at end of file
+../ipsec_crypto/odp_ipsec_misc.h \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_sa_db.c b/example/ipsec_api/odp_ipsec_sa_db.c
index d9c593fa8..7ce1a5292 120000
--- a/example/ipsec_api/odp_ipsec_sa_db.c
+++ b/example/ipsec_api/odp_ipsec_sa_db.c
@@ -1 +1 @@
-../ipsec/odp_ipsec_sa_db.c \ No newline at end of file
+../ipsec_crypto/odp_ipsec_sa_db.c \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_sa_db.h b/example/ipsec_api/odp_ipsec_sa_db.h
index 57d50f3c2..9b022c202 120000
--- a/example/ipsec_api/odp_ipsec_sa_db.h
+++ b/example/ipsec_api/odp_ipsec_sa_db.h
@@ -1 +1 @@
-../ipsec/odp_ipsec_sa_db.h \ No newline at end of file
+../ipsec_crypto/odp_ipsec_sa_db.h \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_sp_db.c b/example/ipsec_api/odp_ipsec_sp_db.c
index c4f785fa6..c7bd160fa 120000
--- a/example/ipsec_api/odp_ipsec_sp_db.c
+++ b/example/ipsec_api/odp_ipsec_sp_db.c
@@ -1 +1 @@
-../ipsec/odp_ipsec_sp_db.c \ No newline at end of file
+../ipsec_crypto/odp_ipsec_sp_db.c \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_sp_db.h b/example/ipsec_api/odp_ipsec_sp_db.h
index e37f78432..26369e9bb 120000
--- a/example/ipsec_api/odp_ipsec_sp_db.h
+++ b/example/ipsec_api/odp_ipsec_sp_db.h
@@ -1 +1 @@
-../ipsec/odp_ipsec_sp_db.h \ No newline at end of file
+../ipsec_crypto/odp_ipsec_sp_db.h \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_stream.c b/example/ipsec_api/odp_ipsec_stream.c
index 4835150d1..57e25fe0e 120000
--- a/example/ipsec_api/odp_ipsec_stream.c
+++ b/example/ipsec_api/odp_ipsec_stream.c
@@ -1 +1 @@
-../ipsec/odp_ipsec_stream.c \ No newline at end of file
+../ipsec_crypto/odp_ipsec_stream.c \ No newline at end of file
diff --git a/example/ipsec_api/odp_ipsec_stream.h b/example/ipsec_api/odp_ipsec_stream.h
index 1cabba28c..6ad6700cc 120000
--- a/example/ipsec_api/odp_ipsec_stream.h
+++ b/example/ipsec_api/odp_ipsec_stream.h
@@ -1 +1 @@
-../ipsec/odp_ipsec_stream.h \ No newline at end of file
+../ipsec_crypto/odp_ipsec_stream.h \ No newline at end of file
diff --git a/example/ipsec_crypto/.gitignore b/example/ipsec_crypto/.gitignore
new file mode 100644
index 000000000..2467edfd4
--- /dev/null
+++ b/example/ipsec_crypto/.gitignore
@@ -0,0 +1 @@
+odp_ipsec_crypto
diff --git a/example/ipsec/Makefile.am b/example/ipsec_crypto/Makefile.am
index 1f603750c..0de60cf89 100644
--- a/example/ipsec/Makefile.am
+++ b/example/ipsec_crypto/Makefile.am
@@ -1,33 +1,34 @@
include $(top_srcdir)/example/Makefile.inc
-bin_PROGRAMS = odp_ipsec
+bin_PROGRAMS = odp_ipsec_crypto
dist_check_SCRIPTS = \
- odp_ipsec_run_ah_in.sh \
- odp_ipsec_run_ah_out.sh \
- odp_ipsec_run_both_in.sh \
- odp_ipsec_run_both_out.sh \
- odp_ipsec_run_esp_in.sh \
- odp_ipsec_run_esp_out.sh \
- odp_ipsec_run_live.sh \
- odp_ipsec_run_router.sh \
- odp_ipsec_run_simple.sh
+ odp_ipsec_crypto_run_ah_in.sh \
+ odp_ipsec_crypto_run_ah_out.sh \
+ odp_ipsec_crypto_run_both_in.sh \
+ odp_ipsec_crypto_run_both_out.sh \
+ odp_ipsec_crypto_run_esp_in.sh \
+ odp_ipsec_crypto_run_esp_out.sh \
+ odp_ipsec_crypto_run_live.sh \
+ odp_ipsec_crypto_run_router.sh \
+ odp_ipsec_crypto_run_simple.sh
-odp_ipsec_SOURCES = odp_ipsec.c \
- odp_ipsec_sa_db.c \
- odp_ipsec_sp_db.c \
- odp_ipsec_fwd_db.c \
- odp_ipsec_cache.c \
- odp_ipsec_cache.h \
- odp_ipsec_fwd_db.h \
- odp_ipsec_misc.h \
- odp_ipsec_sa_db.h \
- odp_ipsec_sp_db.h
+odp_ipsec_crypto_SOURCES = \
+ odp_ipsec.c \
+ odp_ipsec_sa_db.c \
+ odp_ipsec_sp_db.c \
+ odp_ipsec_fwd_db.c \
+ odp_ipsec_cache.c \
+ odp_ipsec_cache.h \
+ odp_ipsec_fwd_db.h \
+ odp_ipsec_misc.h \
+ odp_ipsec_sa_db.h \
+ odp_ipsec_sp_db.h
if WITH_OPENSSL
-odp_ipsec_SOURCES += \
- odp_ipsec_stream.c \
- odp_ipsec_stream.h
+odp_ipsec_crypto_SOURCES += \
+ odp_ipsec_stream.c \
+ odp_ipsec_stream.h
AM_CPPFLAGS = $(OPENSSL_CPPFLAGS)
LDADD += $(OPENSSL_LIBS)
diff --git a/example/ipsec/README b/example/ipsec_crypto/README
index da9d6d1f2..9a3fdc4b9 100644
--- a/example/ipsec/README
+++ b/example/ipsec_crypto/README
@@ -5,9 +5,11 @@ SPDX-License-Identifier: BSD-3-Clause
1. Intro
-The IPsec example application "odp_ipsec" functions as a simple L3 IPv4 router
-with support IPsec 3DES cipher and HMAC-MD5 authentication in both the transmit
-and receive directions. Note that only IPsec "transport" mode is supported.
+The odp_ipsec_crypto example application demonstrates an IPsec implementation
+using ODP crypto APIs. The application functions as a simple L3 IPv4 router
+which supports IPsec 3DES cipher and HMAC-MD5 authentication in both the
+transmit and receive directions. Note that only IPsec "transport" mode is
+supported.
2. Prerequisites
@@ -75,7 +77,7 @@ VM1 has the following interface configurations:
The application is launched on VM1 with the following command:
- sudo ./odp_ipsec -i p7p1,p8p1 \
+ sudo ./odp_ipsec_crypto -i p7p1,p8p1 \
-r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \
-r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \
-p 192.168.111.0/24:192.168.222.0/24:out:both \
@@ -104,7 +106,7 @@ In addition, static ARP and IPv4 routes must be added on VM2:
sudo arp -s 192.168.222.1 08:00:27:4c:55:cc
VM2 must be setup with an IPsec configuration complementing
-the configuration used by the "odp_ipsec" application running
+the configuration used by the "odp_ipsec_crypto" application running
on VM1. The configuration is applied using "setkey" (provided by ipsec-tools
package).
@@ -139,8 +141,8 @@ Apply the setkey configuration:
5. Sanity Test with Real Traffic
Once all three VMs have been configured, static ARP and route entries added,
-setkey configuration applied, and odp_ipsec application is running, VM0 should
-be able to ping VM2 at the 192.168.222.2 address.
+setkey configuration applied, and odp_ipsec_crypto application is running, VM0
+should be able to ping VM2 at the 192.168.222.2 address.
At VM0 console issue the ping to VM2's address:
@@ -165,5 +167,5 @@ At VM2 console use tcpdump to observe IPsec packets:
BASH batch files are now included to run several simple loopback tests that
do not require any packet IO. The scripts create internal "loopback" packet
interfaces.
-Before running the example bash scripts add odp_ipsec to your PATH
-export PATH="<path_to_odp_ipsec>:$PATH"
+Before running the example bash scripts add odp_ipsec_crypto to your PATH
+export PATH="<path_to_odp_ipsec_crypto>:$PATH"
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec_crypto/odp_ipsec.c
index c4f34cbfa..c4f34cbfa 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec_crypto/odp_ipsec.c
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec_crypto/odp_ipsec_cache.c
index 044538c59..044538c59 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec_crypto/odp_ipsec_cache.c
diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec_crypto/odp_ipsec_cache.h
index 1523778ff..1523778ff 100644
--- a/example/ipsec/odp_ipsec_cache.h
+++ b/example/ipsec_crypto/odp_ipsec_cache.h
diff --git a/example/ipsec/odp_ipsec_run_ah_in.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_ah_in.sh
index 5ff168760..18045c7e9 100755
--- a/example/ipsec/odp_ipsec_run_ah_in.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_ah_in.sh
@@ -4,7 +4,7 @@
# - 2 loop interfaces
# - 10 packets
# - Specify API mode on command line
-./odp_ipsec -i loop1,loop2 \
+./odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \
-p 192.168.222.0/24:192.168.111.0/24:in:ah \
-a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \
diff --git a/example/ipsec/odp_ipsec_run_ah_out.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_ah_out.sh
index 53ddd2fb1..8ddfd203d 100755
--- a/example/ipsec/odp_ipsec_run_ah_out.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_ah_out.sh
@@ -4,7 +4,7 @@
# - 2 loop interfaces
# - 10 packets
# - Specify API mode on command line
-./odp_ipsec -i loop1,loop2 \
+./odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \
-p 192.168.111.0/24:192.168.222.0/24:out:ah \
-a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \
diff --git a/example/ipsec/odp_ipsec_run_both_in.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_both_in.sh
index 502f14a7d..4ad08a784 100755
--- a/example/ipsec/odp_ipsec_run_both_in.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_both_in.sh
@@ -4,7 +4,7 @@
# - 2 loop interfaces
# - 10 packets
# - Specify API mode on command line
-./odp_ipsec -i loop1,loop2 \
+./odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \
-p 192.168.222.0/24:192.168.111.0/24:in:both \
-a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \
diff --git a/example/ipsec/odp_ipsec_run_both_out.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_both_out.sh
index 3086e6f12..a9e3ac8af 100755
--- a/example/ipsec/odp_ipsec_run_both_out.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_both_out.sh
@@ -4,7 +4,7 @@
# - 2 loop interfaces
# - 10 packets
# - Specify API mode on command line
-./odp_ipsec -i loop1,loop2 \
+./odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \
-p 192.168.111.0/24:192.168.222.0/24:out:both \
-e 192.168.111.2:192.168.222.2:\
diff --git a/example/ipsec/odp_ipsec_run_esp_in.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_esp_in.sh
index a206cc401..62f73cf7d 100755
--- a/example/ipsec/odp_ipsec_run_esp_in.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_esp_in.sh
@@ -4,7 +4,7 @@
# - 2 loop interfaces
# - 10 packets
# - Specify API mode on command line
-./odp_ipsec -i loop1,loop2 \
+./odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \
-p 192.168.222.0/24:192.168.111.0/24:in:esp \
-e 192.168.222.2:192.168.111.2:\
diff --git a/example/ipsec/odp_ipsec_run_esp_out.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_esp_out.sh
index f8645f0fb..cd9db1e2a 100755
--- a/example/ipsec/odp_ipsec_run_esp_out.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_esp_out.sh
@@ -9,7 +9,7 @@ if [ -z "$IPSEC_EXAMPLE_PATH" ]; then
IPSEC_EXAMPLE_PATH=.
fi
-${IPSEC_EXAMPLE_PATH}/odp_ipsec -i loop1,loop2 \
+${IPSEC_EXAMPLE_PATH}/odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \
-p 192.168.111.0/24:192.168.222.0/24:out:esp \
-e 192.168.111.2:192.168.222.2:\
diff --git a/example/ipsec/odp_ipsec_run_live.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_live.sh
index f61d4e38f..e893674bc 100755
--- a/example/ipsec/odp_ipsec_run_live.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_live.sh
@@ -3,7 +3,7 @@
# Live router test
# - 2 interfaces interfaces
# - Specify API mode on command line
-sudo ./odp_ipsec -i p7p1,p8p1 \
+sudo ./odp_ipsec_crypto -i p7p1,p8p1 \
-r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \
-r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \
-p 192.168.111.0/24:192.168.222.0/24:out:both \
diff --git a/example/ipsec/odp_ipsec_run_router.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_router.sh
index 55ad766f5..920f28e0d 100755
--- a/example/ipsec/odp_ipsec_run_router.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_router.sh
@@ -3,7 +3,7 @@
# Live router test
# - 2 interfaces interfaces
# - Specify API mode on command line
-sudo ./odp_ipsec -i p7p1,p8p1 \
+sudo ./odp_ipsec_crypto -i p7p1,p8p1 \
-r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \
-r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \
-c 1 -m $1
diff --git a/example/ipsec/odp_ipsec_run_simple.sh b/example/ipsec_crypto/odp_ipsec_crypto_run_simple.sh
index 3c3710f5f..3613fe5fd 100755
--- a/example/ipsec/odp_ipsec_run_simple.sh
+++ b/example/ipsec_crypto/odp_ipsec_crypto_run_simple.sh
@@ -9,7 +9,7 @@ if [ -z "$IPSEC_EXAMPLE_PATH" ]; then
IPSEC_EXAMPLE_PATH=.
fi
-${IPSEC_EXAMPLE_PATH}/odp_ipsec -i loop1,loop2 \
+${IPSEC_EXAMPLE_PATH}/odp_ipsec_crypto -i loop1,loop2 \
-r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \
-s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \
-c 2 "$@"
diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec_crypto/odp_ipsec_fwd_db.c
index ca0abf6c1..ca0abf6c1 100644
--- a/example/ipsec/odp_ipsec_fwd_db.c
+++ b/example/ipsec_crypto/odp_ipsec_fwd_db.c
diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec_crypto/odp_ipsec_fwd_db.h
index 278259729..278259729 100644
--- a/example/ipsec/odp_ipsec_fwd_db.h
+++ b/example/ipsec_crypto/odp_ipsec_fwd_db.h
diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec_crypto/odp_ipsec_misc.h
index 71d8f63c4..71d8f63c4 100644
--- a/example/ipsec/odp_ipsec_misc.h
+++ b/example/ipsec_crypto/odp_ipsec_misc.h
diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec_crypto/odp_ipsec_sa_db.c
index 9a7c593b3..9a7c593b3 100644
--- a/example/ipsec/odp_ipsec_sa_db.c
+++ b/example/ipsec_crypto/odp_ipsec_sa_db.c
diff --git a/example/ipsec/odp_ipsec_sa_db.h b/example/ipsec_crypto/odp_ipsec_sa_db.h
index 729d98d56..729d98d56 100644
--- a/example/ipsec/odp_ipsec_sa_db.h
+++ b/example/ipsec_crypto/odp_ipsec_sa_db.h
diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec_crypto/odp_ipsec_sp_db.c
index 1e5820b47..1e5820b47 100644
--- a/example/ipsec/odp_ipsec_sp_db.c
+++ b/example/ipsec_crypto/odp_ipsec_sp_db.c
diff --git a/example/ipsec/odp_ipsec_sp_db.h b/example/ipsec_crypto/odp_ipsec_sp_db.h
index 878f3a7c4..878f3a7c4 100644
--- a/example/ipsec/odp_ipsec_sp_db.h
+++ b/example/ipsec_crypto/odp_ipsec_sp_db.h
diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec_crypto/odp_ipsec_stream.c
index d689c6198..d689c6198 100644
--- a/example/ipsec/odp_ipsec_stream.c
+++ b/example/ipsec_crypto/odp_ipsec_stream.c
diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec_crypto/odp_ipsec_stream.h
index b32f1d7cb..b32f1d7cb 100644
--- a/example/ipsec/odp_ipsec_stream.h
+++ b/example/ipsec_crypto/odp_ipsec_stream.h
diff --git a/example/m4/configure.m4 b/example/m4/configure.m4
index 7bd8acdf8..a3cc1ddbe 100644
--- a/example/m4/configure.m4
+++ b/example/m4/configure.m4
@@ -23,8 +23,8 @@ AC_CONFIG_FILES([example/classifier/Makefile
example/debug/Makefile
example/generator/Makefile
example/hello/Makefile
- example/ipsec/Makefile
example/ipsec_api/Makefile
+ example/ipsec_crypto/Makefile
example/ipfragreass/Makefile
example/ipsec_offload/Makefile
example/l2fwd_simple/Makefile
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index 15263f88e..3cc82516d 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -14,10 +14,10 @@ TESTS = validation/api/pktio/pktio_run.sh \
validation/api/pktio/pktio_run_tap.sh \
validation/api/shmem/shmem_linux$(EXEEXT) \
ipsec/ipsec_api_example.sh \
- ipsec/ipsec_example.sh
+ ipsec/ipsec_crypto_example.sh
dist_check_SCRIPTS = ipsec/ipsec_api_example.sh \
- ipsec/ipsec_example.sh
+ ipsec/ipsec_crypto_example.sh
test_SCRIPTS = $(dist_check_SCRIPTS)
diff --git a/platform/linux-generic/test/ipsec/ipsec_example.sh b/platform/linux-generic/test/ipsec/ipsec_crypto_example.sh
index e38350c03..d99fc3bd2 100755
--- a/platform/linux-generic/test/ipsec/ipsec_example.sh
+++ b/platform/linux-generic/test/ipsec/ipsec_crypto_example.sh
@@ -15,16 +15,16 @@ fi
# Absolute path to the example binary. This is needed during distcheck, which
# keeps scripts and binaries in different directories (scripts are not copied
# into the distribution directory).
-export IPSEC_EXAMPLE_PATH=$(pwd)/../../../example/ipsec
+export IPSEC_EXAMPLE_PATH=$(pwd)/../../../example/ipsec_crypto
declare -i RESULT=0
-pushd $(dirname $0)/../../../../example/ipsec
+pushd $(dirname $0)/../../../../example/ipsec_crypto
-./odp_ipsec_run_simple.sh
+./odp_ipsec_crypto_run_simple.sh
RESULT+=$?
-./odp_ipsec_run_esp_out.sh
+./odp_ipsec_crypto_run_esp_out.sh
RESULT+=$?
popd