mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump bundled libutp to rollback anonymous unions fix (#4877)

This commit is contained in:
Mike Gelfand 2023-02-18 05:59:15 +03:00 committed by GitHub
parent 1e5546280e
commit b3abadf8ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtransmission/peer-io.cc
View File

@ -729,7 +729,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx)
{ {
if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr) if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr)
{ {
io->on_utp_error(args->u1.error_code); io->on_utp_error(args->error_code);
} }
return {}; return {};
}); });
@ -742,7 +742,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx)
if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr) if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr)
{ {
tr_logAddTraceIo(io, fmt::format("{:d} overhead bytes via utp", args->len)); 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 {}; return {};
}); });
@ -754,7 +754,7 @@ void tr_peerIo::utp_init([[maybe_unused]] struct_utp_context* ctx)
{ {
if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr) if (auto* const io = static_cast<tr_peerIo*>(utp_get_userdata(args->socket)); io != nullptr)
{ {
io->on_utp_state_change(args->u1.state); io->on_utp_state_change(args->state);
} }
return {}; return {};
}); });

2
libtransmission/tr-utp.cc
View File

@ -134,7 +134,7 @@ uint64 utp_callback(utp_callback_arguments* args)
break; break;
case UTP_SENDTO: 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; break;
} }

2
third-party/libutp vendored

@ -1 +1 @@
Subproject commit 420e697ac4f3d70005a85e3cfd8b022e2bd5b060 Subproject commit c95738b1a6644b919e5b64d3ea9736cfc5894e0b