Changeset 1615

Timestamp:

Mar 31, 2007, 7:19:27 PM (15 years ago)

Author:

joshe

Message:

Add preference option to disable PEX.

Location:

trunk/gtk

Files:

• main.c (modified) (5 diffs)
• tr_prefs.c (modified) (2 diffs)
• tr_prefs.h (modified) (1 diff)
• tr_torrent.c (modified) (3 diffs)

trunk/gtk/main.c

@@ -172 +172 @@
 static void
 prefschanged( GtkWidget * widget, int id, gpointer data );
+static void
+setpex( tr_torrent_t * tor, void * arg );
 static gboolean
 updatemodel(gpointer gdata);
@@ -735 +737 @@
         PREF_ID_NAT,
         PREF_ID_ICON,
+        PREF_ID_PEX,
     };
     int ii;
@@ -750 +753 @@
     tr_handle_t   * tr;
     int             num;
+    gboolean        boolval;
 
     cbdata = data;
@@ -796 +800 @@
             break;
 
+        case PREF_ID_PEX:
+            boolval = tr_prefs_get_bool_with_default( id );
+            tr_torrentIterate( tr, setpex, &boolval );
+            break;
+
         case PREF_ID_DIR:
         case PREF_ID_ASKDIR:
@@ -804 +813 @@
             break;
     }
+}
+
+void
+setpex( tr_torrent_t * tor, void * arg )
+{
+    gboolean * val;
+
+    val = arg;
+    tr_torrentDisablePex( tor, !(*val) );
 }
 

trunk/gtk/tr_prefs.c

@@ -119 +119 @@
       N_("Attempt to bypass NAT or firewall to allow incoming peer connections") },
 
+    /* PREF_ID_PEX */
+    { "use-peer-exchange",      G_TYPE_BOOLEAN, PR_ENABLED,  NULL,
+      N_("Use peer _exchange if possible"),
+      N_("Perform Azureus or \xc2\xb5Torrent compatible peer exchange with any peers which support it") },
+
     /* PREF_ID_ICON */
     { "use-tray-icon",          G_TYPE_BOOLEAN,
@@ -178 +183 @@
     { FALSE, -1, FALSE }, { FALSE, -1, FALSE },
     /* PREF_ID_NAT */
+    { TRUE,  -1,                FALSE },
+    /* PREF_ID_PEX */
     { TRUE,  -1,                FALSE },
     /* PREF_ID_ICON */

trunk/gtk/tr_prefs.h

@@ -84 +84 @@
     PREF_ID_PORT,
     PREF_ID_NAT,
+    PREF_ID_PEX,
     PREF_ID_ICON,
     PREF_ID_ADDSTD,

trunk/gtk/tr_torrent.c

@@ -35 +35 @@
 
 #include "tr_backend.h"
+#include "tr_prefs.h"
 #include "tr_torrent.h"
 #include "util.h"
@@ -264 +265 @@
   tr_handle_t *back;
   int errcode, trflags;
+  gboolean boolval;
 
   TR_IS_BACKEND(backend);
@@ -295 +297 @@
     return NULL;
   }
+
+  /* I should probably add a property for this but I've had enough
+     with adding useless gtk glue to this program */
+  boolval = tr_prefs_get_bool_with_default( PREF_ID_PEX );
+  tr_torrentDisablePex( handle, !boolval );
 
   ret = g_object_new(TR_TORRENT_TYPE, "torrent-handle", handle,