diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-11-28 15:52:37 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-11-28 15:52:37 +0000 |
| commit | 3f78080496cddb11cbe9040efce694e44cfac7fe (patch) | |
| tree | 2ddbfb4b98bc0e03221c5583566481d6d3169305 /src/sbearssl/sbearssl_run.c | |
| parent | 21ea38f367237fe9ecaa32872f672aa716dca75b (diff) | |
| download | s6-networking-3f78080496cddb11cbe9040efce694e44cfac7fe.tar.xz | |
Small sbearssl bugfixes and usability messages
Diffstat (limited to 'src/sbearssl/sbearssl_run.c')
| -rw-r--r-- | src/sbearssl/sbearssl_run.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c index 3ea4a95..b5f6618 100644 --- a/src/sbearssl/sbearssl_run.c +++ b/src/sbearssl/sbearssl_run.c @@ -14,6 +14,16 @@ #include <skalibs/djbunix.h> #include <s6-networking/sbearssl.h> +#ifdef DEBUG +# include <skalibs/buffer.h> +# include <skalibs/strerr2.h> +# include <skalibs/lolstdio.h> +# define PLM(...) (bprintf(buffer_2, "%s: debug: ", PROG), bprintf(buffer_2, __VA_ARGS__), buffer_putflush(buffer_2, "\n", 1)) +#else +# define PLM(...) +#endif + + int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, uint32_t options, tain_t const *tto) { iopause_fd x[4] ; @@ -24,6 +34,8 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; + tain_now_g() ; + for (;;) { tain_t deadline ; @@ -79,7 +91,7 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, /* Flush to local */ - if (state & BR_SSL_RECVAPP && x[xindex[1]].revents & IOPAUSE_WRITE) + if (state & BR_SSL_RECVAPP && x[xindex[1]].events & x[xindex[1]].revents & IOPAUSE_WRITE) { size_t len ; unsigned char const *s = br_ssl_engine_recvapp_buf(ctx, &len) ; @@ -103,7 +115,7 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, /* Flush to remote */ - if (state & BR_SSL_SENDREC && x[xindex[3]].revents & IOPAUSE_WRITE) + if (state & BR_SSL_SENDREC && x[xindex[3]].events & x[xindex[3]].revents & IOPAUSE_WRITE) { size_t len ; unsigned char const *s = br_ssl_engine_sendrec_buf(ctx, &len) ; @@ -128,7 +140,7 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, /* Fill from local */ - if (state & BR_SSL_SENDAPP & x[xindex[0]].revents & IOPAUSE_READ) + if (state & BR_SSL_SENDAPP && x[xindex[0]].events & x[xindex[0]].revents & IOPAUSE_READ) { size_t len ; unsigned char *s = br_ssl_engine_sendapp_buf(ctx, &len) ; @@ -157,7 +169,7 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, unsigned int verbosity, /* Fill from remote */ - if (state & BR_SSL_RECVREC & x[xindex[2]].revents & IOPAUSE_READ) + if (state & BR_SSL_RECVREC && x[xindex[2]].events & x[xindex[2]].revents & IOPAUSE_READ) { size_t len ; unsigned char *s = br_ssl_engine_recvrec_buf(ctx, &len) ; |