Changeset 11612

Timestamp:

Dec 30, 2010, 7:26:16 PM (12 years ago)

Author:

charles

Message:

(trunk 2.0x) #3528 "TR_PREFS_KEY_BIND_ADDRESS_IPV4 breaks IPv6-only trackers" -- go with option (2) suggested by Harry in the ticket. Confirmed to solve the problem described in the ticket.

Location:

branches/2.0x/libtransmission

Files:

• net.c (modified) (1 diff)
• session.c (modified) (1 diff)
• session.h (modified) (1 diff)
• web.c (modified) (2 diffs)

branches/2.0x/libtransmission/net.c

@@ -291 +291 @@
 
     /* set source address */
-    source_addr = tr_sessionGetPublicAddress( session, addr->type );
+    source_addr = tr_sessionGetPublicAddress( session, addr->type, NULL );
     assert( source_addr );
     sourcelen = setup_sockaddr( source_addr, 0, &source_sock );

branches/2.0x/libtransmission/session.c

@@ -214 +214 @@
 
 const tr_address*
-tr_sessionGetPublicAddress( const tr_session * session, int tr_af_type )
-{
+tr_sessionGetPublicAddress( const tr_session * session, int tr_af_type, tr_bool * is_default_value )
+{
+    const char * default_value;
     const struct tr_bindinfo * bindinfo;
 
     switch( tr_af_type )
     {
-        case TR_AF_INET:  bindinfo = session->public_ipv4; break;
-        case TR_AF_INET6: bindinfo = session->public_ipv6; break;
-        default:          bindinfo = NULL;                 break;
-    }
+        case TR_AF_INET:
+            bindinfo = session->public_ipv4;
+            default_value = TR_DEFAULT_BIND_ADDRESS_IPV4;
+            break;
+
+        case TR_AF_INET6:
+            bindinfo = session->public_ipv6;
+            default_value = TR_DEFAULT_BIND_ADDRESS_IPV6;
+            break;
+
+        default:
+            bindinfo = NULL;
+            default_value = NULL;
+            break;
+    }
+
+    if( is_default_value && bindinfo )
+        *is_default_value = !strcmp( default_value, tr_ntop_non_ts( &bindinfo->addr ) );
 
     return bindinfo ? &bindinfo->addr : NULL;

branches/2.0x/libtransmission/session.h

@@ -202 +202 @@
 tr_bool      tr_sessionIsLocked( const tr_session * );
 
-const struct tr_address*  tr_sessionGetPublicAddress( const tr_session *, int tr_af_type );
+const struct tr_address*  tr_sessionGetPublicAddress( const tr_session  * session,
+                                                      int                 tr_af_type,
+                                                      tr_bool           * is_default_value );
+
 
 struct tr_bindsockets * tr_sessionGetBindSockets( tr_session * );

branches/2.0x/libtransmission/web.c

@@ -141 +141 @@
 {
     const tr_address * addr;
+    tr_bool is_default_value;
     CURL * e = curl_easy_init( );
     const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
@@ -178 +179 @@
     curl_easy_setopt( e, CURLOPT_WRITEFUNCTION, writeFunc );
 
-    if(( addr = tr_sessionGetPublicAddress( s, TR_AF_INET )))
+    if((( addr = tr_sessionGetPublicAddress( s, TR_AF_INET, &is_default_value ))) && !is_default_value )
+        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( addr ) );
+    else if ((( addr = tr_sessionGetPublicAddress( s, TR_AF_INET6, &is_default_value ))) && !is_default_value )
         curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( addr ) );