RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-21 18:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: sock: distinguish dgram from stream types when retrieving old sockets

Browse Source 
For now we still don't retrieve dgram sockets, but the code must be able
to distinguish them before we switch to receivers. This adds a new flag
to the xfer_sock_list indicating that a socket is of type SOCK_DGRAM. The
way to set the flag for now is by looking at the dummy address family which
equals AF_CUST_UDP{4,6} in this case (given that other dgram sockets are not
yet supported).
This commit is contained in:
Willy Tarreau 2020-08-28 19:20:23 +02:00
parent a2c17877b3
commit 9dbb6c43ce
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/sock-t.h
View File

@ -29,6 +29,7 @@
#define SOCK_XFER_OPT_FOREIGN 0x000000001
#define SOCK_XFER_OPT_V6ONLY 0x000000002
#define SOCK_XFER_OPT_DGRAM 0x000000004
/* The list used to transfer sockets between old and new processes */
struct xfer_sock_list {

10
src/sock.c
View File

@ -296,6 +296,10 @@ int sock_get_old_sockets(const char *unixsocket)
if (sock_inet_is_foreign(fd, xfer_sock->addr.ss_family))
xfer_sock->options |= SOCK_XFER_OPT_FOREIGN;
socklen = sizeof(val);
if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &val, &socklen) == 0 && val == SOCK_DGRAM)
xfer_sock->options |= SOCK_XFER_OPT_DGRAM;
#if defined(IPV6_V6ONLY)
/* keep only the v6only flag depending on what's currently
* active on the socket, and always drop the v4v6 one.
@ -362,6 +366,12 @@ int sock_find_compatible_fd(const struct listener *l)
if (!l->proto->addrcmp)
return -1;
/* WT: this is not the right way to do it, it is temporary for the
* transition to receivers.
*/
if (l->addr.ss_family == AF_CUST_UDP4 || l->addr.ss_family == AF_CUST_UDP6)
options |= SOCK_XFER_OPT_DGRAM;
if (l->options & LI_O_FOREIGN)
options |= SOCK_XFER_OPT_FOREIGN;