mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: connection: remove pointers for prehash in conn_hash_params

Browse Source 
Replace unneeded pointers for sni/proxy prehash by plain data type.
The code is slightly cleaner.
This commit is contained in:
Amaury Denoyelle 2021-02-17 16:25:31 +01:00
parent 4c09800b76
commit 36441f46c4
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/connection-t.h
View File

@ -493,10 +493,10 @@ enum conn_hash_params_t {
*/ */
struct conn_hash_params { struct conn_hash_params {
struct server *srv; struct server *srv;
XXH64_hash_t *sni_prehash; XXH64_hash_t sni_prehash;
struct sockaddr_storage *src_addr; struct sockaddr_storage *src_addr;
struct sockaddr_storage *dst_addr; struct sockaddr_storage *dst_addr;
XXH64_hash_t *proxy_prehash; XXH64_hash_t proxy_prehash;
}; };
/* This structure describes a connection with its methods and data. /* This structure describes a connection with its methods and data.

14
src/backend.c
View File

@ -1272,10 +1272,6 @@ int connect_server(struct stream *s)
int proxy_line_ret; int proxy_line_ret;
int64_t hash = 0; int64_t hash = 0;
struct conn_hash_params hash_params; struct conn_hash_params hash_params;
#ifdef USE_OPENSSL
XXH64_hash_t sni_hash;
#endif
XXH64_hash_t proxy_hash;
/* first, set unique connection parameters and then calculate hash */ /* first, set unique connection parameters and then calculate hash */
memset(&hash_params, 0, sizeof(hash_params)); memset(&hash_params, 0, sizeof(hash_params));
@ -1295,9 +1291,9 @@ int connect_server(struct stream *s)
* not the case * not the case
*/ */
if (sni_smp) { if (sni_smp) {
sni_hash = conn_hash_prehash(sni_smp->data.u.str.area, hash_params.sni_prehash =
sni_smp->data.u.str.data); conn_hash_prehash(sni_smp->data.u.str.area,
hash_params.sni_prehash = &sni_hash; sni_smp->data.u.str.data);
} }
} }
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
@ -1325,8 +1321,8 @@ int connect_server(struct stream *s)
if (srv && srv->pp_opts) { if (srv && srv->pp_opts) {
proxy_line_ret = make_proxy_line(trash.area, trash.size, srv, cli_conn, s); proxy_line_ret = make_proxy_line(trash.area, trash.size, srv, cli_conn, s);
if (proxy_line_ret) { if (proxy_line_ret) {
proxy_hash = conn_hash_prehash(trash.area, proxy_line_ret); hash_params.proxy_prehash =
hash_params.proxy_prehash = &proxy_hash; conn_hash_prehash(trash.area, proxy_line_ret);
} }
} }

4
src/connection.c
View File

@ -1468,7 +1468,7 @@ XXH64_hash_t conn_calculate_hash(const struct conn_hash_params *params)
if (params->sni_prehash) { if (params->sni_prehash) {
conn_hash_update(buf, &idx, conn_hash_update(buf, &idx,
params->sni_prehash, sizeof(*params->sni_prehash), &params->sni_prehash, sizeof(params->sni_prehash),
&hash_flags, CONN_HASH_PARAMS_TYPE_SNI); &hash_flags, CONN_HASH_PARAMS_TYPE_SNI);
} }
@ -1488,7 +1488,7 @@ XXH64_hash_t conn_calculate_hash(const struct conn_hash_params *params)
if (params->proxy_prehash) { if (params->proxy_prehash) {
conn_hash_update(buf, &idx, conn_hash_update(buf, &idx,
params->proxy_prehash, sizeof(*params->proxy_prehash), &params->proxy_prehash, sizeof(params->proxy_prehash),
&hash_flags, CONN_HASH_PARAMS_TYPE_PROXY); &hash_flags, CONN_HASH_PARAMS_TYPE_PROXY);
} }