From a52e5df8e60b67ed1558569184be7ea3d233e235 Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Thu, 29 Sep 2016 13:35:26 +0530 Subject: socket: log the client identifier in ssl connect Problem: client identifier is not logged in message in ssl_setup_connection Solutuion: In ssl_setup_connection xl_private is not available in rpc_transport so changed to this peerinfo.identifier. > BUG: 1380275 > Change-Id: I05006a3d63e46de8c388298c22faa9a3329eb6f3 > Signed-off-by: Mohit Agrawal > Reviewed-on: http://review.gluster.org/15596 > NetBSD-regression: NetBSD Build System > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > Reviewed-by: Jeff Darcy > Reviewed-by: Atin Mukherjee > Reviewed-by: Vijay Bellur > (cherry picked from commit 2e23c62cc50037c8e61bcd9c04348409e7627181) Change-Id: Iad08817ee2c2828a08bc22e78c273390562ae9fb BUG: 1383882 Signed-off-by: Mohit Agrawal Reviewed-on: http://review.gluster.org/15624 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Smoke: Gluster Build System --- rpc/rpc-transport/socket/src/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index d9383c36117..f13d9b7f26e 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -343,14 +343,14 @@ ssl_setup_connection (rpc_transport_t *this, int server) gf_log(this->name,GF_LOG_INFO,"peer CN = %s", peer_CN); gf_log (this->name, GF_LOG_INFO, "SSL verification succeeded (client: %s)", - this->xl_private?this->xl_private->client_uid:""); + this->peerinfo.identifier); return gf_strdup(peer_CN); /* Error paths. */ ssl_error: gf_log (this->name, GF_LOG_ERROR, "SSL connect error (client: %s)", - this->xl_private?this->xl_private->client_uid:""); + this->peerinfo.identifier); ssl_dump_error_stack(this->name); free_ssl: SSL_free(priv->ssl_ssl); -- cgit