From patchwork Wed Jan 3 02:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123265 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9645143qgn; Tue, 2 Jan 2018 18:14:05 -0800 (PST) X-Google-Smtp-Source: ACJfBovGBOo9Q8sGTvsIGm1JjuUKCOO8DyM5/svw+MOoPpdIeYuvMweIl3NU62VPvW1lciOukFzM X-Received: by 10.200.35.28 with SMTP id a28mr9371qta.51.1514945644914; Tue, 02 Jan 2018 18:14:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514945644; cv=none; d=google.com; s=arc-20160816; b=Jo9xu8Ic1tyjL0dLH8QFP2JQ7rMN452rBAaHNVFmw3pJ4cVQFETCoNRfe+LOVCQN4U fSnSA67xAYxlOqSRaHpAJ5oh1HtiKCxliOCn60dIdiVpq3+6o0LbK7h8UvB7w/yJTJEd Tdvi12pW974uDwhw2FjO0UQt4hX5VKpqRE+OJXWefmHpDlPZOJ6x39PYAyvMbQsm4f3r aFFIDqDyw/+OwciNON2O3PDcVwIjirlN8a/JKJZuztPJ6JbCM59oiECzs4n8gUVD45wy Ad74Neg06tCDw6FlZpEVKa125VZpEvzV/9idtYsfFvVjRAmG20oOWintNuMJJwoWYGqm ZE1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=1/0ZldxfMHb+bfZCiZmIda+i8KxK+T6oE5zRZrmUux0=; b=QZImIiDfFGgl4k682+H72uYr1rMTpMsR/Z2ZfSw6fYT/vqRGwAJqwc46s6rwiWHB66 ixVvTdRqYTPhEMipqbbb4spxJBT/PW+9PGogGwxQUNK9YNCJAA539b8j88WSKchPslFC RNRrqG4GRQV7dHIFuHXPxOZNTYyDNg+KvPfP3CDAkl/hCvzRy1LIT/LnvUswoITHtXFJ TLbpW15SUzE4MfWqWfhHN+NSCOLGKdWwVj+95IQ7iwf+m/K0DPTTcaUIA7b6aETBNy4d mDnn3ZicEqdTJp5/t6/yPzYom1G4FWI7kLlTxDaLqci+1jFsX6ZS8PApP7kNrrXDnMpU QL/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id g35si12025qtc.110.2018.01.02.18.14.04; Tue, 02 Jan 2018 18:14:04 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A3A8D61520; Wed, 3 Jan 2018 02:14:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6AF996151E; Wed, 3 Jan 2018 02:01:40 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 064B2608E8; Wed, 3 Jan 2018 02:00:36 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 7716D607FE for ; Wed, 3 Jan 2018 02:00:20 +0000 (UTC) Received: from mxback4o.mail.yandex.net (mxback4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1e]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 389B52A2158C for ; Wed, 3 Jan 2018 05:00:19 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback4o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id im7wutMkMQ-0JhKauo1; Wed, 03 Jan 2018 05:00:19 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id GWEi9ANDSh-0IT08mFr; Wed, 03 Jan 2018 05:00:18 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 3 Jan 2018 05:00:08 +0300 Message-Id: <1514944809-29308-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514944809-29308-1-git-send-email-odpbot@yandex.ru> References: <1514944809-29308-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v8 14/15] example: ipsec_api: remove file conflict with ipsec example X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov ipsec_api example installs program with the same name, as ipsec example does. Remove file conflict between two examples. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: c5df42a14c866959ebcb501d64de76a99b6b00d7 **/ example/ipsec_api/Makefile.am | 27 +++++++++++----------- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 14bc5dd66..848683e00 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -3,22 +3,23 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) LDADD += $(OPENSSL_LIBS) -bin_PROGRAMS = odp_ipsec +bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in.sh \ - $(srcdir)/odp_ipsec_run_ah_out.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_run_esp_in.sh \ - $(srcdir)/odp_ipsec_run_esp_out.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_run_live.sh \ - $(srcdir)/odp_ipsec_run_router.sh \ - $(srcdir)/odp_ipsec_run_simple.sh + $(srcdir)/odp_ipsec_api_run_ah_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_out.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_live.sh \ + $(srcdir)/odp_ipsec_api_run_router.sh \ + $(srcdir)/odp_ipsec_api_run_simple.sh -odp_ipsec_SOURCES = odp_ipsec.c \ +odp_ipsec_api_SOURCES = \ + odp_ipsec.c \ odp_ipsec_sa_db.c \ odp_ipsec_sa_db.h \ odp_ipsec_sp_db.c \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_in.sh index c5b105f59..becfc8928 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_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_api -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_api/odp_ipsec_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_out.sh index c8926d5ac..023809a18 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_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_api -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_api/odp_ipsec_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index a0d4c4332..40c488f04 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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_api/odp_ipsec_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index 74a0e3b42..d7118586f 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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_api/odp_ipsec_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_esp_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_in.sh index 39e171cdf..cdb302ef4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_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_api -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_api/odp_ipsec_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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_api/odp_ipsec_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 7ef3e2d08..5d78479e4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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_api/odp_ipsec_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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_api/odp_ipsec_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh similarity index 94% rename from example/ipsec_api/odp_ipsec_run_live.sh rename to example/ipsec_api/odp_ipsec_api_run_live.sh index b506b2af8..9bc0a60f3 100755 --- a/example/ipsec_api/odp_ipsec_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_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_api -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_api/odp_ipsec_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh similarity index 85% rename from example/ipsec_api/odp_ipsec_run_router.sh rename to example/ipsec_api/odp_ipsec_api_run_router.sh index 31b9e7656..982a27e97 100755 --- a/example/ipsec_api/odp_ipsec_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_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_api -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 "$@" diff --git a/example/ipsec_api/odp_ipsec_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh similarity index 87% rename from example/ipsec_api/odp_ipsec_run_simple.sh rename to example/ipsec_api/odp_ipsec_api_run_simple.sh index ddda612a8..bdc2777c9 100755 --- a/example/ipsec_api/odp_ipsec_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -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 "$@"