diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2021-12-10 14:28:24 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-01-09 08:00:00 +0000 |
| commit | 5fba350406ffd9979c5a122bdad94e8c90dfeec6 (patch) | |
| tree | 1d34e5f8b2076b7a86b5e5c61d953efda9825e75 | |
| parent | 667fe9a58354990450ff09a5a78b1e009ab41863 (diff) | |
| download | strace-5fba350406ffd9979c5a122bdad94e8c90dfeec6.tar.gz | |
net: remove IP_ADD_MEMBERSHIP #ifdef guards
IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP are always defined since commit
v5.15~141 "xlat: add fallback values to sock_ip_options", and the struct
ip_mreq definition is present in UAPI since at least v2.6.12, so simply
remove the #ifdef guards.
* src/net.c [!IP_ADD_MEMBERSHIP] (print_mreq): Provide definition.
[!IP_ADD_MEMBERSHIP] (print_setsockopt): Enable case IP_ADD_MEMBERSHIP
and case IP_DROP_MEMBERSHIP.
Complements: v5.15~141 "xlat: add fallback values to sock_ip_options"
| -rw-r--r-- | src/net.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -933,7 +933,6 @@ print_set_linger(struct tcb *const tcp, const kernel_ulong_t addr, } } -#ifdef IP_ADD_MEMBERSHIP static void print_mreq(struct tcb *const tcp, const kernel_ulong_t addr, const int len) @@ -950,7 +949,6 @@ print_mreq(struct tcb *const tcp, const kernel_ulong_t addr, tprint_struct_end(); } } -#endif /* IP_ADD_MEMBERSHIP */ #ifdef IPV6_ADD_MEMBERSHIP static void @@ -1044,12 +1042,10 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level, case SOL_IP: switch (name) { -#ifdef IP_ADD_MEMBERSHIP case IP_ADD_MEMBERSHIP: case IP_DROP_MEMBERSHIP: print_mreq(tcp, addr, len); return; -#endif /* IP_ADD_MEMBERSHIP */ #ifdef MCAST_JOIN_GROUP case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: |