commit 01da571e21b47ad6cd26d034477bf144f9b99f9f
author Emmanuel Hocdet <manu@gandi.net> Fri Oct 13 16:59:49 2017 +0200
committer Willy Tarreau <w@1wt.eu> Fri Oct 27 19:32:36 2017 +0200
tree 904a4cf088cea29679176bad00ccc70ad7dc9d64
parent 58118b43b12d89f5db6cacc5c62cb88d8bd767ed

MINOR: merge ssl_sock_get calls for log and ppv2

Merge ssl_sock_get_version and ssl_sock_get_proto_version.
Change ssl_sock_get_cipher to be used in ppv2.

src/log.c

diff --git a/src/log.c b/src/log.c
index 520263a..2af9050 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1667,8 +1667,7 @@
 				src = NULL;
 				conn = objt_conn(sess->origin);
 				if (conn) {
-					if (sess->listener->bind_conf->xprt == xprt_get(XPRT_SSL))
-						src = ssl_sock_get_cipher_name(conn);
+					src = ssl_sock_get_cipher_name(conn);
 				}
 				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
 				if (ret == NULL)
@@ -1681,8 +1680,7 @@
 				src = NULL;
 				conn = objt_conn(sess->origin);
 				if (conn) {
-					if (sess->listener->bind_conf->xprt == xprt_get(XPRT_SSL))
-						src = ssl_sock_get_proto_version(conn);
+					src = ssl_sock_get_proto_version(conn);
 				}
 				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
 				if (ret == NULL)