diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2021-12-10 17:22:18 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-01-09 08:00:00 +0000 |
| commit | 4448e70d2b2311b9fc403074a189fe3d7da446f7 (patch) | |
| tree | c8b8ad802a010e9806fd846aa7df46bdb12263e8 | |
| parent | 3675eebdd507bc6c1316f6eb5f192ebbb85dc6b9 (diff) | |
| download | strace-4448e70d2b2311b9fc403074a189fe3d7da446f7.tar.gz | |
net: remove IPV6_ADD_MEMBERSHIP and IPV6_{JOIN,LEAVE}_ANYCAST guards
All of them are present since at least Linux 2.6.12 and glibc-2.3.3~616.
* src/net.c [!IPV6_ADD_MEMBERSHIP] (print_mreq6): Enable function
declaration.
[!IPV6_ADD_MEMBERSHIP || !IPV6_JOIN_ANYCAST || !IPV6_LEAVE_ANYCAST] (print_setsockopt):
Enable case IPV6_ADD_MEMBERSHIP, case IPV6_DROP_MEMBERSHIP,
case IPV6_JOIN_ANYCAST, and case IPV6_LEAVE_ANYCAST.
Complements: v5.15~140 "xlat: add fallback values to sock_ipv6_options"
| -rw-r--r-- | src/net.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -950,7 +950,6 @@ print_mreq(struct tcb *const tcp, const kernel_ulong_t addr, } } -#ifdef IPV6_ADD_MEMBERSHIP static void print_mreq6(struct tcb *const tcp, const kernel_ulong_t addr, const int len) @@ -967,7 +966,6 @@ print_mreq6(struct tcb *const tcp, const kernel_ulong_t addr, tprint_struct_end(); } } -#endif /* IPV6_ADD_MEMBERSHIP */ #ifdef PACKET_RX_RING static void @@ -1055,18 +1053,12 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level, case SOL_IPV6: switch (name) { -#ifdef IPV6_ADD_MEMBERSHIP case IPV6_ADD_MEMBERSHIP: case IPV6_DROP_MEMBERSHIP: -# ifdef IPV6_JOIN_ANYCAST case IPV6_JOIN_ANYCAST: -# endif -# ifdef IPV6_LEAVE_ANYCAST case IPV6_LEAVE_ANYCAST: -# endif print_mreq6(tcp, addr, len); return; -#endif /* IPV6_ADD_MEMBERSHIP */ case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: print_group_req(tcp, addr, len); |