Add -J and -j to the TLS tools to check for peer close_notify.

 Also, and more importantly, significantly rewrite stls_run()
for better full-duplex support. This implementation isn't fully
tested yet.

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/tls/s6-tlsd.c b/src/tls/s6-tlsd.c
index 85c0d9f..acd2945 100644
--- a/src/tls/s6-tlsd.c
+++ b/src/tls/s6-tlsd.c
@@ -9,7 +9,7 @@
 
 #include "s6tls-internal.h"
 
-#define USAGE "s6-tlsd [ -S | -s ] [ -Y | -y ] [ -k snilevel ] [ -v verbosity ] [ -K timeout ] [ -Z | -z ] prog..."
+#define USAGE "s6-tlsd [ -S | -s ] [ -J | -j ] [ -Y | -y ] [ -k snilevel ] [ -v verbosity ] [ -K timeout ] [ -Z | -z ] prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 int main (int argc, char const *const *argv)
@@ -28,14 +28,16 @@ int main (int argc, char const *const *argv)
     subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:", &l) ;
+      int opt = subgetopt_r(argc, argv, "SsJjyYv:K:Zzk:", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
         case 'S' : coptions |= 4 ; break ;
         case 's' : coptions &= ~4 ; break ;
-        case 'Y' : coptions |= 1 ; coptions &= ~2 ; break ;
+        case 'J' : coptions |= 8 ; break ;
+        case 'j' : coptions &= ~8 ; break ;
         case 'y' : coptions |= 3 ; break ;
+        case 'Y' : coptions |= 1 ; coptions &= ~2 ; break ;
         case 'v' : if (!uint0_scan(l.arg, &verbosity)) dieusage() ; break ;
         case 'K' : if (!uint0_scan(l.arg, &kimeout)) dieusage() ; break ;
         case 'Z' : poptions &= ~1 ; break ;