From b3abadf8ba4cb1c9afbaec7d8a65ea6a8ada30b4 Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Sat, 18 Feb 2023 05:59:15 +0300 Subject: [PATCH] Bump bundled libutp to rollback anonymous unions fix (#4877) --- libtransmission/peer-io.cc | 6 +++--- libtransmission/tr-utp.cc | 2 +- third-party/libutp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libtransmission/peer-io.cc b/libtransmission/peer-io.cc index 2c462d91b..70ffd5bb0 100644 --- a/libtransmission/peer-io.cc +++ b/libtransmission/peer-io.cc @@ -729,7 +729,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx) { if (auto* const io = static_cast(utp_get_userdata(args->socket)); io != nullptr) { - io->on_utp_error(args->u1.error_code); + io->on_utp_error(args->error_code); } return {}; }); @@ -742,7 +742,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx) if (auto* const io = static_cast(utp_get_userdata(args->socket)); io != nullptr) { tr_logAddTraceIo(io, fmt::format("{:d} overhead bytes via utp", args->len)); - io->bandwidth().notifyBandwidthConsumed(args->u1.send != 0 ? TR_UP : TR_DOWN, args->len, false, tr_time_msec()); + io->bandwidth().notifyBandwidthConsumed(args->send != 0 ? TR_UP : TR_DOWN, args->len, false, tr_time_msec()); } return {}; }); @@ -754,7 +754,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx) { if (auto* const io = static_cast(utp_get_userdata(args->socket)); io != nullptr) { - io->on_utp_state_change(args->u1.state); + io->on_utp_state_change(args->state); } return {}; }); diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc index 32a09a1a3..b26aa83fa 100644 --- a/libtransmission/tr-utp.cc +++ b/libtransmission/tr-utp.cc @@ -134,7 +134,7 @@ uint64 utp_callback(utp_callback_arguments* args) break; case UTP_SENDTO: - utp_send_to(session, args->buf, args->len, args->u1.address, args->u2.address_len); + utp_send_to(session, args->buf, args->len, args->address, args->address_len); break; } diff --git a/third-party/libutp b/third-party/libutp index 420e697ac..c95738b1a 160000 --- a/third-party/libutp +++ b/third-party/libutp @@ -1 +1 @@ -Subproject commit 420e697ac4f3d70005a85e3cfd8b022e2bd5b060 +Subproject commit c95738b1a6644b919e5b64d3ea9736cfc5894e0b