VCL: add TLS opt to socket_test.sh

- add TLS transport opt to socket_test.sh
- resolve clash in vcl_test* args with
  socket_test.sh opts

Change-Id: I952d5b64942664bc3af1098f67445e0f4b93ab32
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/vcl/vcl_test_client.c b/src/vcl/vcl_test_client.c
index ca009b45561..af953e547c5 100644
--- a/src/vcl/vcl_test_client.c
+++ b/src/vcl/vcl_test_client.c
@@ -715,7 +715,7 @@ print_usage_and_exit (void)
 	   "  -w <dir>         Write test results to <dir>.\n"
 	   "  -X               Exit after running test.\n"
 	   "  -D               Use UDP transport layer\n"
-	   "  -S               Use TLS transport layer\n"
+	   "  -L               Use TLS transport layer\n"
 	   "  -E               Run Echo test.\n"
 	   "  -N <num-writes>  Test Cfg: number of writes.\n"
 	   "  -R <rxbuf-size>  Test Cfg: rx buffer size.\n"
@@ -733,7 +733,7 @@ vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
   int c, v;
 
   opterr = 0;
-  while ((c = getopt (argc, argv, "chn:w:XE:I:N:R:T:UBV6DS")) != -1)
+  while ((c = getopt (argc, argv, "chn:w:XE:I:N:R:T:UBV6DL")) != -1)
     switch (c)
       {
       case 'c':
@@ -874,7 +874,7 @@ vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
 	ctrl->cfg.transport_udp = 1;
 	break;
 
-      case 'S':
+      case 'L':
 	ctrl->cfg.transport_tls = 1;
 	break;
 
diff --git a/src/vcl/vcl_test_server.c b/src/vcl/vcl_test_server.c
index 50d509c355b..173bada2315 100644
--- a/src/vcl/vcl_test_server.c
+++ b/src/vcl/vcl_test_server.c
@@ -321,7 +321,7 @@ print_usage_and_exit (void)
 	   "  -6               Use IPv6\n"
 	   "  -w <num>         Number of workers\n"
 	   "  -D               Use UDP transport layer\n"
-	   "  -S               Use TLS transport layer\n");
+	   "  -L               Use TLS transport layer\n");
   exit (1);
 }
 
@@ -371,7 +371,7 @@ vcl_test_server_process_opts (vcl_test_server_main_t * vsm, int argc,
   vsm->cfg.proto = VPPCOM_PROTO_TCP;
 
   opterr = 0;
-  while ((c = getopt (argc, argv, "6DSsw:")) != -1)
+  while ((c = getopt (argc, argv, "6DLsw:")) != -1)
     switch (c)
       {
       case '6':
@@ -382,7 +382,7 @@ vcl_test_server_process_opts (vcl_test_server_main_t * vsm, int argc,
 	vsm->cfg.proto = VPPCOM_PROTO_UDP;
 	break;
 
-      case 'S':
+      case 'L':
 	vsm->cfg.proto = VPPCOM_PROTO_TLS;
 	break;