From: Andy Polyakov <appro@openssl.org>
Date: Sat, 14 Apr 2018 19:42:21 +0000 (+0200)
Subject: apps/s_socket.c: print only dynamically allocated port in do_server.
X-Git-Tag: OpenSSL_1_1_1-pre6~113
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=826e154481e93413a79c37cb1bf4da6175a05875;p=oweals%2Fopenssl.git

apps/s_socket.c: print only dynamically allocated port in do_server.

For formal backward compatibility print original "ACCEPT" message for
fixed port and "ACCEPT host:port" for dynamically allocated.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5956)
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index ae62a135ce..d21bfc60c1 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -283,7 +283,8 @@ int do_server(int *accept_sock, const char *host, const char *port,
     BIO_ADDRINFO_free(res);
     res = NULL;
 
-    {
+    if (BIO_ADDR_rawport(sock_address) == 0) {
+        /* dynamically allocated port, report which one */
         union BIO_sock_info_u info;
         char *hostname = NULL;
         char *service = NULL;
@@ -309,6 +310,9 @@ int do_server(int *accept_sock, const char *host, const char *port,
             ERR_print_errors(bio_err);
             goto end;
         }
+    } else {
+        (void)BIO_printf(bio_s_out, "ACCEPT\n");
+        (void)BIO_flush(bio_s_out);
     }
 
     if (accept_sock != NULL)