]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: ssl: remove the shsess_* macros
authorWilliam Lallemand <wlallemand@haproxy.com>
Thu, 7 May 2020 13:28:02 +0000 (15:28 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Fri, 15 May 2020 12:11:54 +0000 (14:11 +0200)
The shsess_* macros where already defined in proto/ssl_sock.h, remove
them from ssl_sock.c

src/ssl_sock.c

index 58fade6795c0469db84fd72d9a79e64832fc1023..d1b263e506ad9ea8c5b9c03d9fff55285e4344ce 100644 (file)
@@ -531,14 +531,6 @@ const char *SSL_SOCK_KEYTYPE_NAMES[] = {
 static struct shared_context *ssl_shctx = NULL; /* ssl shared session cache */
 static struct eb_root *sh_ssl_sess_tree; /* ssl shared session tree */
 
-#define sh_ssl_sess_tree_delete(s)     ebmb_delete(&(s)->key);
-
-#define sh_ssl_sess_tree_insert(s)     (struct sh_ssl_sess_hdr *)ebmb_insert(sh_ssl_sess_tree, \
-                                                                    &(s)->key, SSL_MAX_SSL_SESSION_ID_LENGTH);
-
-#define sh_ssl_sess_tree_lookup(k)     (struct sh_ssl_sess_hdr *)ebmb_lookup(sh_ssl_sess_tree, \
-                                                                    (k), SSL_MAX_SSL_SESSION_ID_LENGTH);
-
 /* Dedicated callback functions for heartbeat and clienthello.
  */
 #ifdef TLS1_RT_HEARTBEAT
@@ -612,7 +604,6 @@ SSL *ssl_sock_get_ssl_object(struct connection *conn)
 
        return ((struct ssl_sock_ctx *)(conn->xprt_ctx))->ssl;
 }
-
 /*
  * This function gives the detail of the SSL error. It is used only
  * if the debug mode and the verbose mode are activated. It dump all