mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl/server: move ssl_sock_set_srv() to srv_set_ssl() in server.c

Browse Source 
This one has nothing to do with ssl_sock as it manipulates the struct
server only. Let's move it to server.c and remove unneeded dependencies
on ssl_sock.h. This further reduces by 10% the number of includes of
opensslconf.h and by 0.5% the number of compiled lines.
This commit is contained in:
Willy Tarreau 2021-10-06 11:48:34 +02:00
parent d2ae3858e9
commit a8a72c68d5
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/server.h
View File

@ -62,6 +62,7 @@ struct server *new_server(struct proxy *proxy);
void srv_take(struct server *srv);
struct server *srv_drop(struct server *srv);
int srv_init_per_thr(struct server *srv);
void srv_set_ssl(struct server *s, int use_ssl);
/* functions related to server name resolution */
int srv_prepare_for_resolution(struct server *srv, const char *hostname);

1
include/haproxy/ssl_sock.h
View File

@ -73,7 +73,6 @@ const char *ssl_sock_get_proto_version(struct connection *conn);
int ssl_sock_parse_alpn(char *arg, char **alpn_str, int *alpn_len, char **err);
void ssl_sock_set_alpn(struct connection *conn, const unsigned char *, int);
void ssl_sock_set_servername(struct connection *conn, const char *hostname);
void ssl_sock_set_srv(struct server *s, signed char use_ssl);
int ssl_sock_get_cert_used_sess(struct connection *conn);
int ssl_sock_get_cert_used_conn(struct connection *conn);

25
src/server.c
View File

@ -36,7 +36,6 @@
#include <haproxy/resolvers.h>
#include <haproxy/sample.h>
#include <haproxy/server.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stats.h>
#include <haproxy/stream.h>
#include <haproxy/stream_interface.h>
@ -1977,7 +1976,25 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
}
}
}
#endif
/* Activate ssl on server <s>.
* do nothing if there is no change to apply
*
* Must be called with the server lock held.
*/
void srv_set_ssl(struct server *s, int use_ssl)
{
if (s->use_ssl == use_ssl)
return;
s->use_ssl = use_ssl;
if (s->use_ssl)
s->xprt = xprt_get(XPRT_SSL);
else
s->xprt = s->check.xprt = s->agent.xprt = xprt_get(XPRT_RAW);
}
#endif /* USE_OPENSSL */
/*
* Prepare <srv> for hostname resolution.
@ -4144,9 +4161,9 @@ static int cli_parse_set_server(char **args, char *payload, struct appctx *appct
HA_SPIN_LOCK(SERVER_LOCK, &sv->lock);
if (strcmp(args[4], "on") == 0) {
ssl_sock_set_srv(sv, 1);
srv_set_ssl(sv, 1);
} else if (strcmp(args[4], "off") == 0) {
ssl_sock_set_srv(sv, 0);
srv_set_ssl(sv, 0);
} else {
HA_SPIN_UNLOCK(SERVER_LOCK, &sv->lock);
cli_err(appctx, "'set server <srv> ssl' expects 'on' or 'off'.\n");

3
src/server_state.c
View File

@ -26,7 +26,6 @@
#include <haproxy/proxy.h>
#include <haproxy/resolvers.h>
#include <haproxy/server.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/tools.h>
#include <haproxy/xxhash.h>
@ -447,7 +446,7 @@ static void srv_state_srv_update(struct server *srv, int version, char **params)
/* configure ssl if connection has been initiated at startup */
if (srv->ssl_ctx.ctx != NULL)
ssl_sock_set_srv(srv, use_ssl);
srv_set_ssl(srv, use_ssl);
#endif
}

16
src/ssl_sock.c
View File

@ -7696,22 +7696,6 @@ static void __ssl_sock_deinit(void)
BIO_meth_free(ha_meth);
}
/* Activate ssl on server <s>.
* do nothing if there is no change to apply
*
* Must be called with the server lock held.
*/
void ssl_sock_set_srv(struct server *s, signed char use_ssl)
{
if (s->use_ssl == use_ssl)
return;
s->use_ssl = use_ssl;
if (s->use_ssl == 1)
s->xprt = &ssl_sock;
else
s->xprt = s->check.xprt = s->agent.xprt = xprt_get(XPRT_RAW);
}
/*
* Local variables: