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

BUILD: tcp: use IPPROTO_IPV6 instead of SOL_IPV6 on FreeBSD/MacOS

Browse Source 
Lukas reported in issue #1203 that the previous fix for silent-drop in
commit ab79ee8b1 ("BUG/MINOR: tcp: fix silent-drop workaround for IPv6")
breaks the build on FreeBSD/MacOS due to SOL_IPV6 not being defined. On
these platforms, IPPROTO_IPV6 must be used instead, so this should fix
it.

This needs to be backported to whatever version the fix above is backported
to.
This commit is contained in:
Willy Tarreau 2021-03-31 08:29:27 +02:00
parent ab79ee8b11
commit da23195785
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tcp_act.c
View File

@ -211,8 +211,13 @@ static enum act_return tcp_exec_action_silent_drop(struct act_rule *rule, struct
setsockopt(conn->handle.fd, SOL_IP, IP_TTL, &one, sizeof(one)); setsockopt(conn->handle.fd, SOL_IP, IP_TTL, &one, sizeof(one));
#endif #endif
#ifdef IPV6_UNICAST_HOPS #ifdef IPV6_UNICAST_HOPS
#if defined(SOL_IPV6)
if (conn->src && conn->src->ss_family == AF_INET6) if (conn->src && conn->src->ss_family == AF_INET6)
setsockopt(conn->handle.fd, SOL_IPV6, IPV6_UNICAST_HOPS, &one, sizeof(one)); setsockopt(conn->handle.fd, SOL_IPV6, IPV6_UNICAST_HOPS, &one, sizeof(one));
#elif defined(IPPROTO_IPV6)
if (conn->src && conn->src->ss_family == AF_INET6)
setsockopt(conn->handle.fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &one, sizeof(one));
#endif
#endif #endif
out: out:
/* kill the stream if any */ /* kill the stream if any */