Changeset 10535

Timestamp:

Apr 28, 2010, 12:32:43 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #3117 "Tracker queries do not honor bind-address-ipv4" -- possible fix

Location:

trunk/libtransmission

Files:

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

trunk/libtransmission/session.c

@@ -719 +719 @@
     b.socket = -1;
     session->public_ipv4 = tr_memdup( &b, sizeof( struct tr_bindinfo ) );
-    tr_webSetInterface( session, &session->public_ipv4->addr );
 
     str = TR_PREFS_KEY_BIND_ADDRESS_IPV6;

trunk/libtransmission/web.c

@@ -56 +56 @@
 {
     int close_mode;
-    tr_bool haveAddr;
     tr_list * tasks;
     tr_lock * taskLock;
-    tr_address addr;
 };
 
@@ -140 +138 @@
 
 static CURL *
-createEasy( tr_session * s, struct tr_web * w, struct tr_web_task * task )
-{
+createEasy( tr_session * s, struct tr_web_task * task )
+{
+    const tr_address * addr;
     CURL * e = curl_easy_init( );
     const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
@@ -178 +177 @@
     curl_easy_setopt( e, CURLOPT_WRITEDATA, task );
     curl_easy_setopt( e, CURLOPT_WRITEFUNCTION, writeFunc );
-    if( w->haveAddr )
-        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( &w->addr ) );
+
+    if(( addr = tr_sessionGetPublicAddress( s, TR_AF_INET )))
+        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( addr ) );
+
     if( task->range )
         curl_easy_setopt( e, CURLOPT_RANGE, task->range );
@@ -236 +237 @@
 }
 
-void
-tr_webSetInterface( tr_session * session, const tr_address * addr )
-{
-    struct tr_web * web = session->web;
-
-    if( web != NULL )
-        if(( web->haveAddr = ( addr != NULL )))
-            web->addr = *addr;
-}
-
 static void
 tr_webThreadFunc( void * vsession )
@@ -283 +274 @@
         while(( task = tr_list_pop_front( &web->tasks )))
         {
-            curl_multi_add_handle( multi, createEasy( session, web, task ));
+            curl_multi_add_handle( multi, createEasy( session, task ));
             /*fprintf( stderr, "adding a task.. taskCount is now %d\n", taskCount );*/
             ++taskCount;

trunk/libtransmission/web.h

@@ -27 +27 @@
 void tr_webClose( tr_session * session, tr_web_close_mode close_mode );
 
-void tr_webSetInterface( tr_session * session, const struct tr_address * addr );
-
 typedef void ( tr_web_done_func )( tr_session       * session,
                                    long               response_code,