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

Add bind-address-ipv4 to upnp (#845) 

Pass the bind-address-ipv4 to upnpDiscover to allow for upnp to only
use the interface specified. Prevents upnp packet leaks.

Authored-by: LaserEyess <lasereyess@lasereyess.net>
This commit is contained in:
LaserEyess 2022-01-21 10:44:45 -05:00 committed by GitHub
parent f94f7923e8
commit 9e5e27adb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libtransmission/port-forwarding.cc
View File

@ -91,7 +91,12 @@ static void natPulse(tr_shared* s, bool do_check)
s->session->public_peer_port = public_peer_port;
}
s->upnpStatus = tr_upnpPulse(s->upnp, private_peer_port, is_enabled, do_check);
s->upnpStatus = tr_upnpPulse(
s->upnp,
private_peer_port,
is_enabled,
do_check,
tr_address_to_string(&s->session->bind_ipv4->addr));
auto const new_status = tr_sharedTraversalStatus(s);

11
libtransmission/session.cc
View File

@ -137,13 +137,6 @@ void tr_sessionSetEncryption(tr_session* session, tr_encryption_mode mode)
****
***/
struct tr_bindinfo
{
tr_socket_t socket;
tr_address addr;
struct event* ev;
};
static void close_bindinfo(struct tr_bindinfo* b)
{
if (b != nullptr && b->socket != TR_BAD_SOCKET)
@ -1817,8 +1810,6 @@ static void sessionCloseImplStart(tr_session* session)
{
session->is_closing_ = true;
free_incoming_peer_port(session);
if (session->isLPDEnabled)
{
tr_lpdUninit(session);
@ -1835,6 +1826,8 @@ static void sessionCloseImplStart(tr_session* session)
tr_verifyClose(session);
tr_sharedClose(session);
free_incoming_peer_port(session);
session->rpc_server_.reset();
/* Close the torrents. Get the most active ones first so that

7
libtransmission/session.h
View File

@ -51,6 +51,13 @@ struct tr_blocklistFile;
struct tr_cache;
struct tr_fdInfo;
struct tr_bindinfo
{
int socket;
tr_address addr;
struct event* ev;
};
struct tr_turtle_info
{
/* TR_UP and TR_DOWN speed limits */

13
libtransmission/upnp.cc
View File

@ -76,7 +76,7 @@ void tr_upnpClose(tr_upnp* handle)
*** Wrappers for miniupnpc functions
**/
static struct UPNPDev* tr_upnpDiscover(int msec)
static struct UPNPDev* tr_upnpDiscover(int msec, char const* bindaddr)
{
UPNPDev* ret = nullptr;
auto have_err = bool{};
@ -85,14 +85,14 @@ static struct UPNPDev* tr_upnpDiscover(int msec)
int err = UPNPDISCOVER_SUCCESS;
#if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
ret = upnpDiscover(msec, nullptr, nullptr, 0, 0, 2, &err);
ret = upnpDiscover(msec, bindaddr, nullptr, 0, 0, 2, &err);
#else
ret = upnpDiscover(msec, nullptr, nullptr, 0, 0, &err);
ret = upnpDiscover(msec, bindaddr, nullptr, 0, 0, &err);
#endif
have_err = err != UPNPDISCOVER_SUCCESS;
#else
ret = upnpDiscover(msec, nullptr, nullptr, 0);
ret = upnpDiscover(msec, bindaddr, nullptr, 0);
have_err = ret == nullptr;
#endif
@ -218,12 +218,11 @@ enum
UPNP_IGD_INVALID = 3
};
tr_port_forwarding tr_upnpPulse(tr_upnp* handle, tr_port port, bool isEnabled, bool doPortCheck)
tr_port_forwarding tr_upnpPulse(tr_upnp* handle, tr_port port, bool isEnabled, bool doPortCheck, char const* bindaddr)
{
if (isEnabled && handle->state == TR_UPNP_DISCOVER)
{
auto* const devlist = tr_upnpDiscover(2000);
auto* const devlist = tr_upnpDiscover(2000, bindaddr);
errno = 0;
if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr)) ==

2
libtransmission/upnp.h
View File

@ -20,6 +20,6 @@ tr_upnp* tr_upnpInit(void);
void tr_upnpClose(tr_upnp*);
tr_port_forwarding tr_upnpPulse(tr_upnp*, tr_port port, bool isEnabled, bool doPortCheck);
tr_port_forwarding tr_upnpPulse(tr_upnp*, tr_port port, bool isEnabled, bool doPortCheck, char const*);
/* @} */