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

MEDIUM: tools: make str2sa_range() use protocol_lookup()

Browse Source 
By doing so we can remove the hard-coded mapping from AF_INET to AF_CUST_UDP
but we still need to keep the test on the listeners as long as these dummy
families remain present in the code.
This commit is contained in:
Willy Tarreau 2020-09-16 21:37:31 +02:00
parent 910c64da96
commit b2ffc99bbd
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools.c
View File

@ -1164,25 +1164,23 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int
goto out; goto out;
} }
if (opts & PA_O_SOCKET_FD && sock_type == SOCK_DGRAM && ctrl_type == SOCK_DGRAM) {
/* FIXME: for now UDP is still its own family. However some UDP clients
* (logs, dns) use AF_INET and are not aware of AF_CUST_UDP*. Since we
* only want this mapping for listeners and they are the only ones
* setting PA_O_SOCKET_FD, for now we condition this mapping to this.
*/
if (ss.ss_family == AF_INET6)
ss.ss_family = AF_CUST_UDP6;
else if (ss.ss_family == AF_INET)
ss.ss_family = AF_CUST_UDP4;
}
if (proto || (opts & PA_O_CONNECT)) { if (proto || (opts & PA_O_CONNECT)) {
/* Note: if the caller asks for a proto, we must find one, /* Note: if the caller asks for a proto, we must find one,
* except if we return with an fqdn that will resolve later, * except if we return with an fqdn that will resolve later,
* in which case the address is not known yet (this is only * in which case the address is not known yet (this is only
* for servers actually). * for servers actually).
*/ */
new_proto = protocol_by_family(ss.ss_family);
/* FIXME: for now UDP is still its own family. However some UDP clients
* (logs, dns) use AF_INET and are not aware of AF_CUST_UDP*. Since we
* only want this mapping for listeners and they are the only ones
* setting PA_O_SOCKET_FD, for now we condition this mapping to this.
* This effectively means that for now we return TCPv4/v6 for UDP senders.
*/
new_proto = protocol_lookup(ss.ss_family,
(opts & PA_O_SOCKET_FD) && sock_type == SOCK_DGRAM,
(opts & PA_O_SOCKET_FD) && ctrl_type == SOCK_DGRAM);
if (!new_proto && (!fqdn || !*fqdn)) { if (!new_proto && (!fqdn || !*fqdn)) {
memprintf(err, "unsupported protocol family %d for address '%s'", ss.ss_family, str); memprintf(err, "unsupported protocol family %d for address '%s'", ss.ss_family, str);
goto out; goto out;