diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-03-30 21:13:25 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-04-04 20:24:26 +0200 |
| commit | 5540eb7040839b0075a2b7651b6a95264d025e15 (patch) | |
| tree | 7028752431911dd7ad388c63afc535c9d15d909d /apps/s_server.c | |
| parent | 8e2bec9b8aaba602af6fda2523a15238aa49aade (diff) | |
openssl s_server: print the accepting address and socket
The line saying ACCEPT is extended with a space followed by the the
address and port combination on which s_server accepts connections.
The address is written in such a way that s_client should be able to
accepts as argument for the '-connect' option.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5843)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 9b5106d02f..be1564a6f6 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2095,8 +2095,6 @@ int s_server_main(int argc, char *argv[]) if (max_early_data >= 0) SSL_CTX_set_max_early_data(ctx, max_early_data); - BIO_printf(bio_s_out, "ACCEPT\n"); - (void)BIO_flush(bio_s_out); if (rev) server_cb = rev_body; else if (www) @@ -2109,7 +2107,7 @@ int s_server_main(int argc, char *argv[]) unlink(host); #endif do_server(&accept_socket, host, port, socket_family, socket_type, protocol, - server_cb, context, naccept); + server_cb, context, naccept, bio_s_out); print_stats(bio_s_out, ctx); ret = 0; end: @@ -2673,9 +2671,6 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) } BIO_printf(bio_s_out, "CONNECTION CLOSED\n"); OPENSSL_clear_free(buf, bufsize); - if (ret >= 0) - BIO_printf(bio_s_out, "ACCEPT\n"); - (void)BIO_flush(bio_s_out); return ret; } @@ -3284,8 +3279,6 @@ static int www_body(int s, int stype, int prot, unsigned char *context) SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); err: - if (ret >= 0) - BIO_printf(bio_s_out, "ACCEPT\n"); OPENSSL_free(buf); BIO_free_all(io); return ret; |