From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 3 Oct 2020 11:35:56 +0000 (+0200)
Subject: OpenSSL ssl_recv_data(): Include the file descriptor in the log messages
X-Git-Tag: v_3_0_29~56
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=3158f348649a8f7f4393abfa54d7e8e76b07a465

OpenSSL ssl_recv_data(): Include the file descriptor in the log messages
---

diff --git a/openssl.c b/openssl.c
index 4a0e23b3..95f0fa46 100644
--- a/openssl.c
+++ b/openssl.c
@@ -207,7 +207,10 @@ extern int ssl_send_data(struct ssl_attr *ssl_attr, const unsigned char *buf, si
 extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t max_length)
 {
    BIO *bio = ssl_attr->openssl_attr.bio;
+   SSL *ssl;
    int ret = 0;
+   int fd = -1;
+
    memset(buf, 0, max_length);
 
    /*
@@ -221,12 +224,18 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
    if (ret < 0)
    {
       log_ssl_errors(LOG_LEVEL_ERROR,
-         "Receiving data over TLS/SSL failed");
+         "Receiving data on socket %d over TLS/SSL failed", fd);
 
       return -1;
    }
 
-   log_error(LOG_LEVEL_RECEIVED, "TLS: %N", ret, buf);
+   if (BIO_get_ssl(bio, &ssl) == 1)
+   {
+      fd = SSL_get_fd(ssl);
+   }
+
+   log_error(LOG_LEVEL_RECEIVED, "TLS from socket %d: %N",
+      fd, ret, buf);
 
    return ret;
 }