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.

include/proto/ssl_sock.h

diff --git a/include/proto/ssl_sock.h b/include/proto/ssl_sock.h
index 8779770..86ad137 100644
--- a/include/proto/ssl_sock.h
+++ b/include/proto/ssl_sock.h
@@ -52,7 +52,6 @@
 void ssl_sock_free_ca(struct bind_conf *bind_conf);
 const char *ssl_sock_get_cipher_name(struct connection *conn);
 const char *ssl_sock_get_proto_version(struct connection *conn);
-char *ssl_sock_get_version(struct connection *conn);
 void ssl_sock_set_servername(struct connection *conn, const char *hostname);
 int ssl_sock_get_cert_used_sess(struct connection *conn);
 int ssl_sock_get_cert_used_conn(struct connection *conn);

src/connection.c

diff --git a/src/connection.c b/src/connection.c
index a29bc2c..012f805 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -980,7 +980,7 @@
 	struct sockaddr_storage *dst = &null_addr;
 
 #ifdef USE_OPENSSL
-	char *value = NULL;
+	const char *value = NULL;
 	struct tlv_ssl *tlv;
 	int ssl_tlv_len = 0;
 	struct chunk *cn_trash;
@@ -1035,7 +1035,7 @@
 		tlv->tlv.type = PP2_TYPE_SSL;
 		if (ssl_sock_is_ssl(remote)) {
 			tlv->client |= PP2_CLIENT_SSL;
-			value = ssl_sock_get_version(remote);
+			value = ssl_sock_get_proto_version(remote);
 			if (value) {
 				ssl_tlv_len += make_tlv(&buf[ret+ssl_tlv_len], (buf_len-ret-ssl_tlv_len), PP2_SUBTYPE_SSL_VERSION, strlen(value), value);
 			}

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)

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 62fcd00..b263540 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5296,19 +5296,21 @@
 	}
 }
 
-/* used for logging, may be changed for a sample fetch later */
+/* used for logging/ppv2, may be changed for a sample fetch later */
 const char *ssl_sock_get_cipher_name(struct connection *conn)
 {
-	if (!conn->xprt && !conn->xprt_ctx)
+	if (!ssl_sock_is_ssl(conn))
 		return NULL;
+
 	return SSL_get_cipher_name(conn->xprt_ctx);
 }
 
-/* used for logging, may be changed for a sample fetch later */
+/* used for logging/ppv2, may be changed for a sample fetch later */
 const char *ssl_sock_get_proto_version(struct connection *conn)
 {
-	if (!conn->xprt && !conn->xprt_ctx)
+	if (!ssl_sock_is_ssl(conn))
 		return NULL;
+
 	return SSL_get_version(conn->xprt_ctx);
 }
 
@@ -5510,14 +5512,6 @@
 	return 1;
 }
 
-char *ssl_sock_get_version(struct connection *conn)
-{
-	if (!ssl_sock_is_ssl(conn))
-		return NULL;
-
-	return (char *)SSL_get_version(conn->xprt_ctx);
-}
-
 /* Sets advertised SNI for outgoing connections. Please set <hostname> to NULL
  * to disable SNI.
  */