Merged!

Maxim.

On 10/28/2014 01:38 PM, Taras Kondratiuk wrote:
Since commit "e968af6 Remove pktio type awareness" ipsec application doesn't
accept 'f' and 't' options. getopt_long() function is configured to stop
processing at first non-option, so 'm' option at the end is not processed.

Remove these redundant options.

Signed-off-by: Taras Kondratiuk <[email protected]>
---
  example/ipsec/run_ah_in.sh    |    2 +-
  example/ipsec/run_ah_out.sh   |    2 +-
  example/ipsec/run_both_in.sh  |    2 +-
  example/ipsec/run_both_out.sh |    2 +-
  example/ipsec/run_esp_in.sh   |    2 +-
  example/ipsec/run_esp_out.sh  |    2 +-
  example/ipsec/run_live.sh     |    2 +-
  example/ipsec/run_router.sh   |    2 +-
  example/ipsec/run_simple.sh   |    2 +-
  9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/example/ipsec/run_ah_in.sh b/example/ipsec/run_ah_in.sh
index 0dfca9f..5ff1687 100755
--- a/example/ipsec/run_ah_in.sh
+++ b/example/ipsec/run_ah_in.sh
@@ -9,4 +9,4 @@
  -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 \
  -s 192.168.222.2:192.168.111.2:loop2:loop1:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_ah_out.sh b/example/ipsec/run_ah_out.sh
index 995a6cb..b78193e 100755
--- a/example/ipsec/run_ah_out.sh
+++ b/example/ipsec/run_ah_out.sh
@@ -9,4 +9,4 @@
  -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 \
  -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_both_in.sh b/example/ipsec/run_both_in.sh
index 6d24b08..502f14a 100755
--- a/example/ipsec/run_both_in.sh
+++ b/example/ipsec/run_both_in.sh
@@ -11,4 +11,4 @@
  -e 192.168.222.2:192.168.111.2:\
  3des:301:c966199f24d095f3990a320d749056401e82b26570320292 \
  -s 192.168.222.2:192.168.111.2:loop2:loop1:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_both_out.sh b/example/ipsec/run_both_out.sh
index c02f670..3086e6f 100755
--- a/example/ipsec/run_both_out.sh
+++ b/example/ipsec/run_both_out.sh
@@ -11,4 +11,4 @@
  3des:201:656c8523255ccc23a66c1917aa0cf30991fce83532a4b224 \
  -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \
  -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_esp_in.sh b/example/ipsec/run_esp_in.sh
index 8868f8d..a206cc4 100755
--- a/example/ipsec/run_esp_in.sh
+++ b/example/ipsec/run_esp_in.sh
@@ -10,4 +10,4 @@
  -e 192.168.222.2:192.168.111.2:\
  3des:301:c966199f24d095f3990a320d749056401e82b26570320292 \
  -s 192.168.222.2:192.168.111.2:loop2:loop1:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_esp_out.sh b/example/ipsec/run_esp_out.sh
index 5359fdd..b5a541e 100755
--- a/example/ipsec/run_esp_out.sh
+++ b/example/ipsec/run_esp_out.sh
@@ -10,4 +10,4 @@
  -e 192.168.111.2:192.168.222.2:\
  3des:201:656c8523255ccc23a66c1917aa0cf30991fce83532a4b224 \
  -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \
--c 2 -f 0 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_live.sh b/example/ipsec/run_live.sh
index 5d72a1a..f61d4e3 100755
--- a/example/ipsec/run_live.sh
+++ b/example/ipsec/run_live.sh
@@ -14,4 +14,4 @@ sudo ./odp_ipsec -i p7p1,p8p1 \
  -e 192.168.222.2:192.168.111.2:\
  3des:301:c966199f24d095f3990a320d749056401e82b26570320292 \
  -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \
--c 2 -f 0 -t 3 -m $1
+-c 2 -m $1
diff --git a/example/ipsec/run_router.sh b/example/ipsec/run_router.sh
index 6aac5d2..55ad766 100755
--- a/example/ipsec/run_router.sh
+++ b/example/ipsec/run_router.sh
@@ -6,4 +6,4 @@
  sudo ./odp_ipsec -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 -f 0 -t 3 -m $1
+-c 1 -m $1
diff --git a/example/ipsec/run_simple.sh b/example/ipsec/run_simple.sh
index 9b10b65..4622791 100755
--- a/example/ipsec/run_simple.sh
+++ b/example/ipsec/run_simple.sh
@@ -7,4 +7,4 @@
  ./odp_ipsec -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 -f 0 -m $1
+-c 2 -m $1


_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to