Changeset 3119

Timestamp:

Sep 21, 2007, 5:31:29 AM (15 years ago)

Author:

charles

Message:

slightly less broken handling of cases where we can't bind to our listening port.

Location:

trunk/libtransmission

Files:

• internal.h (modified) (2 diffs)
• shared.c (modified) (4 diffs)
• torrent.c (modified) (2 diffs)
• tracker.c (modified) (2 diffs)

trunk/libtransmission/internal.h

@@ -61 +61 @@
 void tr_torrentUnlock  ( const tr_torrent * );
 
-void tr_torrentChangeMyPort  ( tr_torrent *, int port );
+void tr_torrentChangeMyPort  ( tr_torrent * );
 
 int tr_torrentExists( tr_handle *, const uint8_t * );
@@ -121 +121 @@
 
     uint8_t                  * azId;
-    int                        publicPort;
 
     /* Where to download */

trunk/libtransmission/shared.c

@@ -146 +146 @@
 
     /* Create the new one */
+    s->bindSocket = tr_netBindTCP( port );
+
+    /* Notify the trackers */
+    SetPublicPort( s, port );
+
     /* XXX should handle failure here in a better way */
-    s->bindSocket = tr_netBindTCP( port );
-    if( 0 > s->bindSocket )
-    {
-        /* Notify the trackers */
-        SetPublicPort( s, 0 );
+    if( s->bindSocket < 0 )
+    {
         /* Remove the forwarding for the old port */
         tr_natpmpRemoveForwarding( s->natpmp );
@@ -160 +162 @@
         tr_inf( "Bound listening port %d", port );
         listen( s->bindSocket, 5 );
-        if( port != s->publicPort )
-        {
-            /* Notify the trackers */
-            SetPublicPort( s, port );
-        }
         /* Forward the new port */
         tr_natpmpForwardPort( s->natpmp, port );
@@ -175 +172 @@
 int tr_sharedGetPublicPort( tr_shared * s )
 {
+fprintf( stderr, "%s:%d tr_sharedGetPublicPort returning %d\n", __FILE__, __LINE__, (int)s->publicPort );
     return s->publicPort;
 }
@@ -269 +267 @@
 
     for( tor = h->torrentList; tor; tor = tor->next )
-        tr_torrentChangeMyPort( tor, port );
+        tr_torrentChangeMyPort( tor );
 }
 

trunk/libtransmission/torrent.c

@@ -360 +360 @@
                                   NULL );
  
-    /* We have a new torrent */
-    tor->publicPort = tr_sharedGetPublicPort( h->shared );
-
     tr_sharedUnlock( h->shared );
 
@@ -668 +665 @@
 
 void
-tr_torrentChangeMyPort( tr_torrent * tor, int port )
-{
-    tr_torrentLock( tor );
-
-    tor->publicPort = port;
-
+tr_torrentChangeMyPort( tr_torrent * tor )
+{
     if( tor->tracker )
         tr_trackerChangeMyPort( tor->tracker );
-
-    tr_torrentUnlock( tor );
 }
 

trunk/libtransmission/tracker.c

@@ -29 +29 @@
 #include "ptrarray.h"
 #include "publish.h"
+#include "shared.h"
 #include "tracker.h"
 #include "trevent.h"
@@ -772 +773 @@
         tor->escaped,
         tor->peer_id,
-        torrent->publicPort,
+        tr_sharedGetPublicPort( torrent->handle->shared ),
         torrent->uploadedCur,
         torrent->downloadedCur,