MINOR: connection: use dst addr as parameter for srv conn hash
The destination address is used as an input to the server connection hash. The
address and port are used as separated hash inputs. Note that they are not used
when statically specified on the server line. This is only useful for dynamic
destination address.
This is typically used when the server address is dynamically set via the
set-dst action. The address and port are separated hash parameters.
Most notably, it should fixed set-dst use case (cf github issue #947).
diff --git a/src/backend.c b/src/backend.c
index d8413fb..852b0db 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1274,6 +1274,18 @@
}
#endif /* USE_OPENSSL */
+ /* 2. destination address */
+ if (!(s->flags & SF_ADDR_SET)) {
+ err = alloc_dst_address(&s->target_addr, srv, s);
+ if (err != SRV_STATUS_OK)
+ return SF_ERR_INTERNAL;
+
+ s->flags |= SF_ADDR_SET;
+ }
+
+ if (srv && (!is_addr(&srv->addr) || srv->flags & SRV_F_MAPPORTS))
+ hash_params.dst_addr = s->target_addr;
+
if (srv)
hash = conn_calculate_hash(&hash_params);
@@ -1460,23 +1472,15 @@
srv_conn->owner = s->sess;
if (reuse_mode == PR_O_REUSE_NEVR)
conn_set_private(srv_conn);
- }
- }
- if (!srv_conn || !sockaddr_alloc(&srv_conn->dst, 0, 0)) {
- if (srv_conn)
- conn_free(srv_conn);
- return SF_ERR_RESOURCE;
- }
-
- if (!(s->flags & SF_ADDR_SET)) {
- err = alloc_dst_address(&s->target_addr, srv, s);
- if (err != SRV_STATUS_OK) {
- conn_free(srv_conn);
- return SF_ERR_INTERNAL;
+ if (!sockaddr_alloc(&srv_conn->dst, 0, 0)) {
+ conn_free(srv_conn);
+ return SF_ERR_RESOURCE;
+ }
}
-
- s->flags |= SF_ADDR_SET;
+ else {
+ return SF_ERR_RESOURCE;
+ }
}
/* copy the target address into the connection */