Changeset 52

Timestamp:

Jan 25, 2006, 5:20:21 PM (17 years ago)

Author:

joshe

Message:

Send stopped and started events to trackers when the listening port is changed,
but without disrupting existing peer connections.
In the GTK prefs dialog, change the port immediately instead of on next invocation.

Location:

trunk

Files:

• gtk/prefs.c (modified) (2 diffs)
• libtransmission/tracker.c (modified) (7 diffs)

trunk/gtk/prefs.c

@@ -180 +180 @@
     cf_setpref(PREF_PORT, strnum);
     g_free(strnum);
-    /* XXX should I change the port here?  is it even possible? */
 
     /* save uselimit pref */
@@ -198 +197 @@
     }
 
+    tr_setBindPort(data->tr, gtk_spin_button_get_value_as_int(data->port));
     setlimit(data->tr);
   }

trunk/libtransmission/tracker.c

@@ -52 +52 @@
 
     int            bindPort;
+    int            newPort;
 };
 
@@ -75 +76 @@
 
     tc->bindPort = h->bindPort;
+    tc->newPort  = -1;
 
     return tc;
@@ -90 +92 @@
 
     /* Do we need to send an event? */
-    if( tc->started || tc->completed || tc->stopped )
+    if( tc->started || tc->completed || tc->stopped || 0 < tc->newPort )
     {
         return 1;
@@ -124 +126 @@
 void tr_trackerChangePort( tr_tracker_t * tc, int port )
 {
-    /* XXX this doesn't always work, should send stopped then started events */
-    tc->bindPort = port;
+    tc->newPort = port;
 }
 
@@ -161 +162 @@
                 ( tc->completed ? "sending 'completed'" :
                   ( tc->stopped ? "sending 'stopped'" :
-                    "getting peers" ) ) );
+                    ( 0 < tc->newPort ? "sending 'stopped' to change port" :
+                      "getting peers" ) ) ) );
 
         tc->status  = TC_STATUS_CONNECT;
@@ -247 +249 @@
     int        ret;
 
+    if( tc->started && 0 < tc->newPort )
+    {
+        tc->bindPort = tc->newPort;
+        tc->newPort = -1;
+    }
+
     if( tc->started )
         event = "&event=started";
     else if( tc->completed )
         event = "&event=completed";
-    else if( tc->stopped )
+    else if( tc->stopped || 0 < tc->newPort )
         event = "&event=stopped";
     else
@@ -480 +488 @@
         tc->stopped = 0;
     }
+    else if( 0 < tc->newPort )
+    {
+        tc->started = 1;
+    }
 
 cleanup: