Add bind-address-ipv4 to upnp

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

libtransmission/port-forwarding.c

@@ -97,7 +97,8 @@ 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->public_ipv4->addr));
 
     newStatus = tr_sharedTraversalStatus(s);
 

libtransmission/session.c

@@ -128,13 +128,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 != NULL && b->socket != TR_BAD_SOCKET)
@@ -1920,8 +1913,6 @@ static void sessionCloseImplStart(tr_session* session)
 
     session->isClosing = true;
 
-    free_incoming_peer_port(session);
-
     if (session->isLPDEnabled)
     {
         tr_lpdUninit(session);
@@ -1938,6 +1929,7 @@ static void sessionCloseImplStart(tr_session* session)
 
     tr_verifyClose(session);
     tr_sharedClose(session);
+    free_incoming_peer_port(session);
     tr_rpcClose(&session->rpcServer);
 
     /* Close the torrents. Get the most active ones first so that

libtransmission/session.h

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

libtransmission/upnp.c

@@ -80,7 +80,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)
 {
     struct UPNPDev* ret;
     bool have_err;
@@ -89,14 +89,14 @@ static struct UPNPDev* tr_upnpDiscover(int msec)
     int err = UPNPDISCOVER_SUCCESS;
 
 #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
-    ret = upnpDiscover(msec, NULL, NULL, 0, 0, 2, &err);
+    ret = upnpDiscover(msec, bindaddr, NULL, 0, 0, 2, &err);
 #else
-    ret = upnpDiscover(msec, NULL, NULL, 0, 0, &err);
+    ret = upnpDiscover(msec, bindaddr, NULL, 0, 0, &err);
 #endif
 
     have_err = err != UPNPDISCOVER_SUCCESS;
 #else
-    ret = upnpDiscover(msec, NULL, NULL, 0);
+    ret = upnpDiscover(msec, bindaddr, NULL, 0);
     have_err = ret == NULL;
 #endif
 
@@ -182,15 +182,15 @@ enum
     UPNP_IGD_INVALID = 3
 };
 
-int tr_upnpPulse(tr_upnp* handle, int port, bool isEnabled, bool doPortCheck)
+int tr_upnpPulse(tr_upnp* handle, int port, bool isEnabled, bool doPortCheck, char const* bindaddr)
 {
     int ret;
 
     if (isEnabled && handle->state == TR_UPNP_DISCOVER)
     {
         struct UPNPDev* devlist;
 
-        devlist = tr_upnpDiscover(2000);
+        devlist = tr_upnpDiscover(2000, bindaddr);
 
         errno = 0;
 

libtransmission/upnp.h

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