Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply optional peer socket TOS to UDP sockets (#1043)

Browse Source 
This effectively makes the TOS setting apply to uTP and DHT traffic.

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Dan Walters
2021-10-26 20:59:31 -05:00
committed by GitHub
parent 2b65b985cf
commit 8234d064a8
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libtransmission/session.cc
View File

@@ -2250,6 +2250,8 @@ static void toggle_utp(void* vsession)
tr_udpSetSocketBuffers(session); tr_udpSetSocketBuffers(session);
tr_udpSetSocketTOS(session);
/* But don't call tr_utpClose -- see reset_timer in tr-utp.c for an /* But don't call tr_utpClose -- see reset_timer in tr-utp.c for an
explanation. */ explanation. */
} }

20
libtransmission/tr-udp.cc
View File

@@ -124,6 +124,24 @@ void tr_udpSetSocketBuffers(tr_session* session)
} }
} }
void tr_udpSetSocketTOS(tr_session* session)
{
if (session->peerSocketTOS == 0)
{
return;
}
if (session->udp_socket != TR_BAD_SOCKET)
{
tr_netSetTOS(session->udp_socket, session->peerSocketTOS, TR_AF_INET);
}
if (session->udp6_socket != TR_BAD_SOCKET)
{
tr_netSetTOS(session->udp6_socket, session->peerSocketTOS, TR_AF_INET6);
}
}
/* BEP-32 has a rather nice explanation of why we need to bind to one /* BEP-32 has a rather nice explanation of why we need to bind to one
IPv6 address, if I may say so myself. */ IPv6 address, if I may say so myself. */
// TODO: remove goto, it prevents reducing scope of local variables // TODO: remove goto, it prevents reducing scope of local variables
@@ -359,6 +377,8 @@ void tr_udpInit(tr_session* ss)
tr_udpSetSocketBuffers(ss); tr_udpSetSocketBuffers(ss);
tr_udpSetSocketTOS(ss);
if (ss->isDHTEnabled) if (ss->isDHTEnabled)
{ {
tr_dhtInit(ss); tr_dhtInit(ss);

1
libtransmission/tr-udp.h
View File

@@ -30,5 +30,6 @@ THE SOFTWARE.
void tr_udpInit(tr_session*); void tr_udpInit(tr_session*);
void tr_udpUninit(tr_session*); void tr_udpUninit(tr_session*);
void tr_udpSetSocketBuffers(tr_session*); void tr_udpSetSocketBuffers(tr_session*);
void tr_udpSetSocketTOS(tr_session*);
bool tau_handle_message(tr_session* session, uint8_t const* msg, size_t msglen); bool tau_handle_message(tr_session* session, uint8_t const* msg, size_t msglen);