Changeset 8174

Timestamp:

Apr 7, 2009, 8:13:08 PM (14 years ago)

Author:

charles

Message:

(trunk gtk) use the RPC API for updating the blocklist and for testing the port.

Location:

trunk/gtk

Files:

• Makefile.am (modified) (2 diffs)
• blocklist.c (deleted)
• blocklist.h (deleted)
• main.c (modified) (2 diffs)
• tr-core.c (modified) (7 diffs)
• tr-core.h (modified) (3 diffs)
• tr-prefs.c (modified) (14 diffs)

trunk/gtk/Makefile.am

@@ -38 +38 @@
     actions.h \
     add-dialog.h \
-    blocklist.h \
     conf.h \
     details.h \
@@ -72 +71 @@
     actions.c \
     add-dialog.c \
-    blocklist.c \
     conf.c \
     details.c \

trunk/gtk/main.c

@@ -43 +43 @@
 #include "actions.h"
 #include "add-dialog.h"
-#include "blocklist.h"
 #include "conf.h"
 #include "details.h"
@@ -447 +446 @@
         appsetup( win, argfiles, cbdata, startpaused, startminimized );
         tr_sessionSetRPCCallback( session, onRPCChanged, cbdata );
-        gtr_blocklist_maybe_autoupdate( cbdata->core );
+
+        /* on startup, check & see if it's time to update the blocklist */
+        if( pref_flag_get( PREF_KEY_BLOCKLIST_UPDATES_ENABLED )
+            && ( time( NULL ) - pref_int_get( "blocklist-date" ) > ( 60 * 60 * 24 * 7 ) ) )
+                tr_core_blocklist_update( cbdata->core );
 
         gtk_main( );

trunk/gtk/tr-core.c

@@ -35 +35 @@
 
 #include <libtransmission/transmission.h>
+#include <libtransmission/bencode.h>
+#include <libtransmission/rpcimpl.h>
+#include <libtransmission/json.h>
 #include <libtransmission/utils.h> /* tr_free */
 
@@ -97 +100 @@
 }
 
-static void
-tr_core_marshal_blocklist( GClosure *     closure,
-                           GValue * ret   UNUSED,
-                           guint          count,
-                           const GValue * vals,
-                           gpointer hint  UNUSED,
-                           gpointer       marshal )
-{
-    typedef void ( *TRMarshalErr )
-                                ( gpointer, enum tr_core_err, const char *,
-                                gpointer );
-    TRMarshalErr callback;
-    GCClosure *  cclosure = (GCClosure*) closure;
-    gboolean     flag;
-    const char * str;
-    gpointer     inst, gdata;
-
-    g_return_if_fail( count == 3 );
-
-    inst    = g_value_peek_pointer( vals );
-    flag    = g_value_get_boolean( vals + 1 );
-    str     = g_value_get_string( vals + 2 );
-    gdata   = closure->data;
-
-    callback = (TRMarshalErr)( marshal ? marshal : cclosure->callback );
-    callback( inst, flag, str, gdata );
-}
-
-static void
-tr_core_marshal_prompt( GClosure *     closure,
-                        GValue * ret   UNUSED,
-                        guint          count,
-                        const GValue * vals,
-                        gpointer hint  UNUSED,
-                        gpointer       marshal )
-{
-    typedef void ( *TRMarshalPrompt )( gpointer, tr_ctor *, gpointer );
-    TRMarshalPrompt callback;
-    GCClosure *     cclosure = (GCClosure*) closure;
-    gpointer        ctor;
-    gpointer        inst, gdata;
-
-    g_return_if_fail( count == 2 );
-
-    inst      = g_value_peek_pointer( vals );
-    ctor      = g_value_peek_pointer( vals + 1 );
-    gdata     = closure->data;
-
-    callback = (TRMarshalPrompt)( marshal ? marshal : cclosure->callback );
-    callback( inst, ctor, gdata );
-}
-
 static int
 isDisposed( const TrCore * core )
@@ -176 +127 @@
 {
     GObjectClass * gobject_class;
-    TrCoreClass *  core_class;
+    TrCoreClass *  cc;
 
     g_type_class_add_private( g_class, sizeof( struct TrCorePrivate ) );
@@ -183 +134 @@
     gobject_class->dispose = tr_core_dispose;
 
-
-    core_class = TR_CORE_CLASS( g_class );
-    core_class->blocksig = g_signal_new( "blocklist-status",
-                                         G_TYPE_FROM_CLASS(
-                                             g_class ),
-                                         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                         tr_core_marshal_blocklist,
-                                         G_TYPE_NONE,
-                                         2, G_TYPE_BOOLEAN, G_TYPE_STRING );
-    core_class->errsig = g_signal_new( "error", G_TYPE_FROM_CLASS( g_class ),
-                                       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                       tr_core_marshal_err, G_TYPE_NONE,
-                                       2, G_TYPE_INT, G_TYPE_STRING );
-    core_class->promptsig = g_signal_new( "add-torrent-prompt",
-                                          G_TYPE_FROM_CLASS(
-                                              g_class ),
-                                          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                          tr_core_marshal_prompt,
-                                          G_TYPE_NONE,
-                                          1, G_TYPE_POINTER );
-    core_class->quitsig = g_signal_new( "quit", G_TYPE_FROM_CLASS( g_class ),
-                                        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                        g_cclosure_marshal_VOID__VOID,
-                                        G_TYPE_NONE, 0 );
-    core_class->prefsig = g_signal_new( "prefs-changed",
-                                        G_TYPE_FROM_CLASS( g_class ),
-                                        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                        g_cclosure_marshal_VOID__STRING,
-                                        G_TYPE_NONE, 1, G_TYPE_STRING );
+    cc = TR_CORE_CLASS( g_class );
+
+    cc->blocklistSignal = g_signal_new( "blocklist-updated",          /* name */
+                                        G_TYPE_FROM_CLASS( g_class ), /* applies to TrCore */
+                                        G_SIGNAL_RUN_FIRST,           /* when to invoke */
+                                        0, NULL, NULL,                /* accumulator */
+                                        g_cclosure_marshal_VOID__INT, /* marshaler */
+                                        G_TYPE_NONE,                  /* return type */
+                                        1, G_TYPE_INT );              /* signal arguments */
+
+    cc->portSignal = g_signal_new( "port-tested",
+                                   G_TYPE_FROM_CLASS( g_class ),
+                                   G_SIGNAL_RUN_LAST,
+                                   0, NULL, NULL,
+                                   g_cclosure_marshal_VOID__BOOLEAN,
+                                   G_TYPE_NONE,
+                                   1, G_TYPE_BOOLEAN );
+
+    cc->errsig = g_signal_new( "error",
+                               G_TYPE_FROM_CLASS( g_class ),
+                               G_SIGNAL_RUN_LAST,
+                               0, NULL, NULL,
+                               tr_core_marshal_err,
+                               G_TYPE_NONE,
+                               2, G_TYPE_INT, G_TYPE_STRING );
+
+    cc->promptsig = g_signal_new( "add-torrent-prompt",
+                                  G_TYPE_FROM_CLASS( g_class ),
+                                  G_SIGNAL_RUN_LAST,
+                                  0, NULL, NULL,
+                                  g_cclosure_marshal_VOID__POINTER,
+                                  G_TYPE_NONE,
+                                  1, G_TYPE_POINTER );
+
+    cc->quitsig = g_signal_new( "quit",
+                                G_TYPE_FROM_CLASS( g_class ),
+                                G_SIGNAL_RUN_LAST,
+                                0, NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE,
+                                0 );
+
+    cc->prefsig = g_signal_new( "prefs-changed",
+                                G_TYPE_FROM_CLASS( g_class ),
+                                G_SIGNAL_RUN_LAST,
+                                0, NULL, NULL,
+                                g_cclosure_marshal_VOID__STRING,
+                                G_TYPE_NONE,
+                                1, G_TYPE_STRING );
 
 #ifdef HAVE_DBUS_GLIB
@@ -887 +858 @@
 }
 
-void
-tr_core_blocksig( TrCore *     core,
-                  gboolean     isDone,
-                  const char * status )
-{
-    g_signal_emit( core, TR_CORE_GET_CLASS(
-                       core )->blocksig, 0, isDone, status );
+static void
+emitBlocklistUpdated( TrCore * core, int ruleCount )
+{
+    g_signal_emit( core, TR_CORE_GET_CLASS( core )->blocklistSignal, 0, ruleCount );
+}
+
+static void
+emitPortTested( TrCore * core, gboolean isOpen )
+{
+    g_signal_emit( core, TR_CORE_GET_CLASS( core )->portSignal, 0, isOpen );
 }
 
@@ -1040 +1014 @@
     if( findTorrentInModel( core, id, &iter ) )
     {
-        TrTorrent *    gtor;
+        TrTorrent * gtor;
         GtkTreeModel * model = tr_core_model( core );
         gtk_tree_model_get( model, &iter, MC_TORRENT, &gtor, -1 );
@@ -1337 +1311 @@
 }
 
+/***
+****
+****  RPC Interface
+****
+***/
+
+/* #define DEBUG_RPC */
+
+static int nextTag = 1;
+
+typedef void ( server_response_func )( TrCore * core, tr_benc * response, gpointer user_data );
+
+struct pending_request_data
+{
+    int tag;
+    TrCore * core;
+    server_response_func * responseFunc;
+    gpointer responseFuncUserData;
+};
+
+static GHashTable * pendingRequests = NULL;
+
+static gboolean
+readResponseIdle( void * vresponse )
+{
+    GByteArray * response;
+    tr_benc top;
+    int64_t intVal;
+    int tag;
+    struct pending_request_data * data;
+
+    response = vresponse;
+    tr_jsonParse( response->data, response->len, &top, NULL );
+    tr_bencDictFindInt( &top, "tag", &intVal );
+    tag = (int)intVal;
+
+    data = g_hash_table_lookup( pendingRequests, &tag );
+    if( data )
+        (*data->responseFunc)(data->core, &top, data->responseFuncUserData );
+
+    tr_bencFree( &top );
+    g_hash_table_remove( pendingRequests, &tag );
+    g_byte_array_free( response, TRUE );
+    return FALSE;
+}
+
+static void
+readResponse( tr_session  * session UNUSED,
+              const char  * response,
+              size_t        response_len,
+              void        * unused UNUSED )
+{
+    GByteArray * bytes = g_byte_array_new( );
+#ifdef DEBUG_RPC
+    g_message( "response: [%*.*s]", (int)response_len, (int)response_len, response );
+#endif
+    g_byte_array_append( bytes, (const uint8_t*)response, response_len );
+    g_idle_add( readResponseIdle, bytes );
+}
+
+static void
+sendRequest( TrCore * core, const char * json, int tag,
+             server_response_func * responseFunc, void * responseFuncUserData )
+{
+    tr_session * session = tr_core_session( core );
+
+    if( pendingRequests == NULL )
+    {
+        pendingRequests = g_hash_table_new_full( g_int_hash, g_int_equal, NULL, g_free );
+    }
+
+    if( session == NULL )
+    {
+        g_error( "GTK+ client doesn't support connections to remote servers yet." );
+    }
+    else
+    {
+        /* remember this request */
+        struct pending_request_data * data;
+        data = g_new0( struct pending_request_data, 1 );
+        data->core = core;
+        data->tag = tag;
+        data->responseFunc = responseFunc;
+        data->responseFuncUserData = responseFuncUserData;
+        g_hash_table_insert( pendingRequests, &data->tag, data );
+
+        /* make the request */
+#ifdef DEBUG_RPC
+        g_message( "request: [%s]", json );
+#endif
+        tr_rpc_request_exec_json( session, json, strlen( json ), readResponse, GINT_TO_POINTER(tag) );
+    }
+}
+
+/***
+****  Sending a test-port request via RPC
+***/
+
+static void
+portTestResponseFunc( TrCore * core, tr_benc * response, gpointer userData UNUSED )
+{
+    tr_benc * args;
+    tr_bool isOpen = FALSE;
+
+    if( tr_bencDictFindDict( response, "arguments", &args ) )
+        tr_bencDictFindBool( args, "port-is-open", &isOpen );
+
+    emitPortTested( core, isOpen );
+}
+
+void
+tr_core_port_test( TrCore * core )
+{
+    char buf[128];
+    const int tag = nextTag++;
+    g_snprintf( buf, sizeof( buf ), "{ \"method\": \"port-test\", \"tag\": %d }", tag );
+    sendRequest( core, buf, tag, portTestResponseFunc, NULL );
+}
+
+/***
+****  Updating a blocklist via RPC
+***/
+
+static void
+blocklistResponseFunc( TrCore * core, tr_benc * response, gpointer userData UNUSED )
+{
+    tr_benc * args;
+    int64_t ruleCount = 0;
+
+    if( tr_bencDictFindDict( response, "arguments", &args ) )
+        tr_bencDictFindInt( args, "blocklist-size", &ruleCount );
+
+    if( ruleCount > 0 )
+        pref_int_set( "blocklist-date", time( NULL ) );
+
+    emitBlocklistUpdated( core, ruleCount );
+}
+
+void
+tr_core_blocklist_update( TrCore * core )
+{
+    char buf[128];
+    const int tag = nextTag++;
+    g_snprintf( buf, sizeof( buf ), "{ \"method\": \"blocklist-update\", \"tag\": %d }", tag );
+    sendRequest( core, buf, tag, blocklistResponseFunc, NULL );
+}

trunk/gtk/tr-core.h

@@ -65 +65 @@
     GObjectClass    parent;
 
-    /* "blocklist" signal:
-       void  handler( TrCore *, const char *, gpointer userData ); */
-    int    blocksig;
-
-    /* "error" signal:
-       void handler( TrCore *, enum tr_core_err, const char *, gpointer ) */
-    int    errsig;
-
-    /* "add-torrent-prompt" signal:
-       void handler( TrCore *, gpointer ctor, gpointer userData )
+    /* "blocklist-updated" signal with a callback type of
+        void (*callback )( TrCore*, int ruleCount, gpointer userData ). */
+    int blocklistSignal;
+
+    /* "port-tested" signal with a callback type of
+       void( *callback )( TrCore*, gboolean isOpen, gpointer userData ). */
+    int portSignal;
+
+    /* "error" signal with a callback type of
+       void( *callback )( TrCore*, enum tr_core_err, const char * humanReadable, gpointer userData ). */
+    int errsig;
+
+    /* "add-torrent-prompt" signal with a callback type of
+       void ( *callback)( TrCore *, gpointer ctor, gpointer userData )
        The handler assumes ownership of ctor and must free when done */
-    int    promptsig;
+    int promptsig;
 
     /* "quit" signal:
        void handler( TrCore *, gpointer ) */
-    int    quitsig;
+    int quitsig;
 
     /* "prefs-changed" signal:
        void handler( TrCore *, int, gpointer ) */
-    int    prefsig;
+    int prefsig;
 }
 TrCoreClass;
@@ -138 +142 @@
 
 /** Add a torrent. */
-gboolean tr_core_add_file(
-                 TrCore*,
-    const char * filename,
-    gboolean *
-                 setme_success,
-    GError **    err );
+gboolean tr_core_add_file( TrCore*, const char * filename, gboolean * setme_success, GError **    err );
+/** Add a torrent. */
+void tr_core_add_torrent( TrCore*, TrTorrent* );
 
 /** Present the main window */
-gboolean tr_core_present_window(
-              TrCore*,
-    gboolean *
-              setme_success,
-    GError ** err );
-
-/** Add a torrent. */
-void     tr_core_add_torrent( TrCore*,
-                              TrTorrent* );
+gboolean tr_core_present_window( TrCore*, gboolean * setme_success, GError ** err ); 
+
 
 /**
@@ -168 +162 @@
 /* we've gotten notice from RPC that a torrent has been destroyed;
    update our gui accordingly */
-void     tr_core_torrent_destroyed( TrCore * self,
-                                    int      id );
+void  tr_core_torrent_destroyed( TrCore * self, int torrentId );
 
 /* remove a torrent */
-void     tr_core_remove_torrent( TrCore *    self,
-                                 TrTorrent * gtor,
-                                 int         deleteFiles );
+void  tr_core_remove_torrent( TrCore * self, TrTorrent * gtor, int deleteFiles );
 
 /* update the model with current torrent status */
-void     tr_core_update( TrCore * self );
+void  tr_core_update( TrCore * self );
 
 /* emit the "quit" signal */
-void     tr_core_quit( TrCore * self );
-
-/* emit the "blocklist changed" signal */
-void     tr_core_blocksig( TrCore *     core,
-                           gboolean     isDone,
-                           const char * status );
-
-/* Set a preference value, save the prefs file, and emit the
-   "prefs-changed" signal */
-void     tr_core_set_pref( TrCore *     self,
-                           const char * key,
-                           const char * val );
-
-/* Set a boolean preference value, save the prefs file, and emit the
-   "prefs-changed" signal */
-void     tr_core_set_pref_bool( TrCore *     self,
-                                const char * key,
-                                gboolean     val );
-
-/* Set an integer preference value, save the prefs file, and emit the
-   "prefs-changed" signal */
-void     tr_core_set_pref_int( TrCore *     self,
-                               const char * key,
-                               int          val );
-
-/* Set a double preference value, save the prefs file, and emit the
-   "prefs-changed" signal */
-void     tr_core_set_pref_double( TrCore *     self,
-                                  const char * key,
-                                  double       val );
+void  tr_core_quit( TrCore * self );
+
+/**
+***  Set a preference value, save the prefs file, and emit the "prefs-changed" signal
+**/
+
+void tr_core_set_pref     ( TrCore * self, const char * key, const char * val );
+void tr_core_set_pref_bool( TrCore * self, const char * key, gboolean val );
+void tr_core_set_pref_int ( TrCore * self, const char * key, int val );
+void tr_core_set_pref_double( TrCore * self, const char * key, double val );
+
+/**
+***
+**/
+
+void tr_core_port_test( TrCore * core );
+
+void tr_core_blocklist_update( TrCore * core );
 
 /**

trunk/gtk/tr-prefs.c

@@ -14 +14 @@
 #include <errno.h>
 #include <stdarg.h>
+#include <limits.h> /* USHRT_MAX */
 #include <stdlib.h> /* free() */
 #include <unistd.h>
@@ -22 +23 @@
 #include <libtransmission/version.h>
 #include <libtransmission/web.h>
-#include "blocklist.h"
 #include "conf.h"
 #include "hig.h"
@@ -357 +357 @@
 struct blocklist_data
 {
-    GtkWidget *  check;
-    GtkWidget *  dialog;
-    TrCore *     core;
-    gulong       id;
-    int          abortFlag;
-    char         secondary[256];
+    gulong      updateBlocklistTag;
+    GtkWidget * updateBlocklistButton;
+    GtkWidget * updateBlocklistDialog;
+    GtkWidget * check;
+    TrCore    * core;
 };
 
 static void
-updateBlocklistText( GtkWidget * w,
-                     TrCore *    core )
+updateBlocklistText( GtkWidget * w, TrCore * core )
 {
     const int n = tr_blocklistGetRuleCount( tr_core_session( core ) );
     char      buf[512];
-
     g_snprintf( buf, sizeof( buf ),
                 ngettext( "Enable _blocklist (contains %'d rule)",
@@ -378 +375 @@
 }
 
-static void
-onBlocklistDialogResponse( GtkDialog *  d,
-                           int response UNUSED,
-                           gpointer     gdata )
+/* prefs dialog is being destroyed, so stop listening to blocklist updates */
+static void
+peerPageDestroyed( gpointer gdata, GObject * dead UNUSED )
 {
     struct blocklist_data * data = gdata;
-
-    g_signal_handler_disconnect( data->core, data->id );
-    gtk_widget_destroy( GTK_WIDGET( d ) );
-}
-
-static void
-onBlocklistStatus( TrCore * core UNUSED,
-                   gboolean      isDone,
-                   const char *  status,
-                   gpointer      gdata )
+    if( data->updateBlocklistTag > 0 )
+        g_signal_handler_disconnect( data->core, data->updateBlocklistTag );
+    g_free( data );
+}
+
+/* user hit "close" in the blocklist-update dialog */
+static void
+onBlocklistUpdateResponse( GtkDialog * dialog, gint response UNUSED, gpointer gdata )
 {
     struct blocklist_data * data = gdata;
-
-    gdk_threads_enter( );
-    gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( data-> dialog ),
-                                              "%s", status );
-    gtk_dialog_set_response_sensitive( GTK_DIALOG( data->dialog ),
-                                       GTK_RESPONSE_CANCEL, !isDone );
-    gtk_dialog_set_response_sensitive( GTK_DIALOG( data->dialog ),
-                                       GTK_RESPONSE_CLOSE, isDone );
-    if( isDone )
-        updateBlocklistText( data->check, core );
-    gdk_threads_leave( );
-}
-
-static void
-onUpdateBlocklistCB( GtkButton * w,
-                     gpointer    gdata )
-{
-    GtkWidget *             d;
+    gtk_widget_destroy( GTK_WIDGET( dialog ) );
+    gtk_widget_set_sensitive( data->updateBlocklistButton, TRUE );
+    data->updateBlocklistDialog = NULL;
+    g_signal_handler_disconnect( data->core, data->updateBlocklistTag );
+}
+
+/* core says the blocklist was updated */
+static void
+onBlocklistUpdated( TrCore * core, int n, gpointer gdata )
+{
+    const char * s = ngettext( "Blocklist now has %'d rule.", "Blocklist now has %'d rules.", n );
     struct blocklist_data * data = gdata;
-
-    d =
-        gtk_message_dialog_new( GTK_WINDOW( gtk_widget_get_toplevel( 
-                                                                    GTK_WIDGET(
-                                                                        w ) ) ),
-                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                               GTK_MESSAGE_INFO,
-                               GTK_BUTTONS_NONE,
-                               _( "Updating Blocklist" ) );
-
-    data->dialog = d;
-    data->id =
-        g_signal_connect( data->core, "blocklist-status", G_CALLBACK(
-                              onBlocklistStatus ), data );
-
-    gtk_dialog_add_buttons( GTK_DIALOG( d ),
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-                            NULL );
-    gtk_dialog_set_response_sensitive( GTK_DIALOG(
-                                           d ), GTK_RESPONSE_CLOSE, FALSE );
-
-    g_signal_connect( d, "response", G_CALLBACK(
-                          onBlocklistDialogResponse ), data );
+    GtkMessageDialog * d = GTK_MESSAGE_DIALOG( data->updateBlocklistDialog );
+    gtk_widget_set_sensitive( data->updateBlocklistButton, TRUE );
+    gtk_message_dialog_set_markup( d, _( "<b>Update succeeded!</b>" ) );
+    gtk_message_dialog_format_secondary_text( d, s, n );
+    updateBlocklistText( data->check, core );
+}
+
+/* user pushed a button to update the blocklist */
+static void
+onBlocklistUpdate( GtkButton * w, gpointer gdata )
+{
+    GtkWidget * d;
+    struct blocklist_data * data = gdata;
+    d = gtk_message_dialog_new( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( w ) ) ),
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_INFO,
+                                GTK_BUTTONS_CLOSE,
+                               _( "Update Blocklist" ) );
+    gtk_widget_set_sensitive( data->updateBlocklistButton, FALSE );
+    gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( d ), _( "Getting new blocklist..." ) );
+    data->updateBlocklistDialog = d;
+    g_signal_connect( d, "response", G_CALLBACK(onBlocklistUpdateResponse), data );
     gtk_widget_show( d );
-
-    gtr_blocklist_update( data->core );
+    tr_core_blocklist_update( data->core );
+    data->updateBlocklistTag = g_signal_connect( data->core, "blocklist-updated", G_CALLBACK( onBlocklistUpdated ), data );
 }
 
@@ -449 +434 @@
 {
     const int val = gtk_toggle_button_get_active( w )
-                    ? TR_ENCRYPTION_REQUIRED
-                    : TR_ENCRYPTION_PREFERRED;
-
+                  ? TR_ENCRYPTION_REQUIRED
+                  : TR_ENCRYPTION_PREFERRED;
     tr_core_set_pref_int( TR_CORE( core ), TR_PREFS_KEY_ENCRYPTION, val );
 }
@@ -476 +460 @@
     h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
     gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
-    b = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) );
+    b = data->updateBlocklistButton = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) );
     data->check = w;
     g_object_set_data( G_OBJECT( b ), "session",
                       tr_core_session( TR_CORE( core ) ) );
-    g_signal_connect( b, "clicked", G_CALLBACK( onUpdateBlocklistCB ), data );
+    g_signal_connect( b, "clicked", G_CALLBACK( onBlocklistUpdate ), data );
     gtk_box_pack_start( GTK_BOX( h ), b, FALSE, FALSE, 0 );
     g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), b );
@@ -516 +500 @@
 
     hig_workarea_finish( t, &row );
+    g_object_weak_ref( G_OBJECT( t ), peerPageDestroyed, data );
     return t;
 }
@@ -736 +721 @@
 
     /* port */
-    w = new_spin_button( TR_PREFS_KEY_RPC_PORT, core, 0, 65535, 1 );
+    w = new_spin_button( TR_PREFS_KEY_RPC_PORT, core, 0, USHRT_MAX, 1 );
     page->widgets = g_slist_append( page->widgets, w );
     w = hig_workarea_add_row( t, &row, _( "Listening _port:" ), w, NULL );
@@ -941 +926 @@
     page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
 
-    w = new_spin_button( TR_PREFS_KEY_PROXY_PORT, core, 0, 65535, 1 );
+    w = new_spin_button( TR_PREFS_KEY_PROXY_PORT, core, 0, USHRT_MAX, 1 );
     page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
     w = hig_workarea_add_row( t, &row, _( "Proxy _port:" ), w, NULL );
@@ -1231 +1216 @@
 ****/
 
-struct test_port_data
-{
-    GtkWidget *  label;
-    gboolean *   alive;
-    char text[128];
+struct network_page_data
+{
+    TrCore     * core;
+    GtkWidget  * portLabel;
+    GtkWidget  * portButton;
+    GtkWidget  * portSpin;
+    gulong       portTag;
+    gulong       prefsTag;
 };
 
-/* this is invoked in the gtk main loop's thread */
-static gboolean
-testing_port_done_idle( gpointer gdata )
-{
-    struct test_port_data * data = gdata;
-
-    if( *data->alive )
-    {
-        gdk_threads_enter( );
-        gtk_label_set_markup( GTK_LABEL( data->label ), data->text );
-        gdk_threads_leave( );
-    }
-
-    return FALSE;
-}
-
-/* this is invoked in the libtransmission thread */
-static void
-testing_port_done( tr_session * session        UNUSED,
-                   long          response_code UNUSED,
-                   const void *                response,
-                   size_t                      response_len,
-                   void *                      gdata )
-{
-    struct test_port_data * data = gdata;
-
-    if( *data->alive )
-    {
-        const int isOpen = response_len && *(char*)response == '1';
-        g_snprintf( data->text, sizeof( data->text ), isOpen 
-                    ? _( "Port is <b>open</b>" )
-                    : _( "Port is <b>closed</b>" ) );
-        g_idle_add( testing_port_done_idle, data );
-    }
-}
-
-static gboolean
-testing_port_begin( gpointer gdata )
-{
-    struct test_port_data * data = gdata;
-
-    if( *data->alive )
-    {
-        char            url[256];
-        GObject       * o       = G_OBJECT( data->label );
-        GtkSpinButton * spin    = g_object_get_data( o, "tr-port-spin" );
-        tr_session    * session = g_object_get_data( o, "session" );
-        const int       port    = gtk_spin_button_get_value_as_int( spin );
-        g_snprintf( url, sizeof( url ),
-                    "http://portcheck.transmissionbt.com/%d",
-                    port );
-        tr_webRun( session, url, NULL, testing_port_done, data );
-    }
-    return FALSE;
-}
-
-struct network_page_data
-{
-    gboolean *   alive;
-    GtkWidget *  label;
-    guint        id;
-    TrCore *     core;
-};
-
-static void
-onCorePrefsChanged( TrCore * core UNUSED,
-                    const char *  key,
-                    gpointer      gdata )
+static void
+onCorePrefsChanged( TrCore * core UNUSED, const char *  key, gpointer gdata )
 {
     if( !strcmp( key, TR_PREFS_KEY_PEER_PORT ) )
     {
-        struct network_page_data * ndata = gdata;
-        struct test_port_data *    data;
-
-        gtk_label_set_markup( GTK_LABEL( ndata->label ),
-                             _( "<i>Testing port...</i>" ) );
-
-        /* wait three seconds to give the port forwarding time to kick in */
-        data = g_new0( struct test_port_data, 1 );
-        data->label = ndata->label;
-        data->alive = ndata->alive;
-        gtr_timeout_add_seconds( 3, testing_port_begin, data );
+        struct network_page_data * data = gdata;
+        gtk_label_set_text( GTK_LABEL( data->portLabel ), _( "Status unknown" ) );
+        gtk_widget_set_sensitive( data->portButton, TRUE );
+        gtk_widget_set_sensitive( data->portSpin, TRUE );
     }
 }
 
 static void
-networkPageDestroyed( gpointer       gdata,
-                      GObject * dead UNUSED )
+networkPageDestroyed( gpointer gdata, GObject * dead UNUSED )
 {
     struct network_page_data * data = gdata;
-
-    *data->alive = FALSE;
-    g_signal_handler_disconnect( data->core, data->id );
+    if( data->prefsTag > 0 )
+        g_signal_handler_disconnect( data->core, data->prefsTag );
+    if( data->portTag > 0 )
+        g_signal_handler_disconnect( data->core, data->portTag );
     g_free( data );
+}
+
+static void
+onPortTested( TrCore * core UNUSED, gboolean isOpen, gpointer vdata )
+{
+    struct network_page_data * data = vdata;
+    const char * markup = isOpen ? _( "Port is <b>open</b>" ) : _( "Port is <b>closed</b>" );
+    gtk_label_set_markup( GTK_LABEL( data->portLabel ), markup );
+    gtk_widget_set_sensitive( data->portButton, TRUE );
+    gtk_widget_set_sensitive( data->portSpin, TRUE );
+}
+
+static void
+onPortTest( GtkButton * button UNUSED, gpointer vdata )
+{
+    struct network_page_data * data = vdata;
+    gtk_widget_set_sensitive( data->portButton, FALSE );
+    gtk_widget_set_sensitive( data->portSpin, FALSE );
+    gtk_label_set_markup( GTK_LABEL( data->portLabel ), _( "<i>Testing...</i>" ) );
+    data->portTag = g_signal_connect( data->core, "port-tested", G_CALLBACK(onPortTested), data );
+    tr_core_port_test( data->core );
 }
 
@@ -1341 +1277 @@
     GtkWidget *                t;
     GtkWidget *                w;
-    GtkWidget *                w2;
     GtkWidget *                h;
     GtkWidget *                l;
     struct network_page_data * data;
 
-    /* register to stop listening to core prefs changes when the page is
-      destroyed */
+    /* register to stop listening to core prefs changes when the page is destroyed */
     data = g_new0( struct network_page_data, 1 );
     data->core = TR_CORE( core );
-
-    /* we leak this gboolean* s.t. we know it will still be alive when the port
-       check is done, whether the dialog was destroyed or not.  kind of
-       clumsy... */
-    data->alive = g_new( gboolean, 1 );
-    *data->alive = TRUE;
 
     /* build the page */
@@ -1361 +1289 @@
     hig_workarea_add_section_title( t, &row, _( "Incoming Peers" ) );
 
+    s = _( "_Port for incoming connections:" );
+    w = data->portSpin = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, USHRT_MAX, 1 );
+    hig_workarea_add_row( t, &row, s, w, NULL );
+
     h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
-    w2 = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, 65535, 1 );
-    gtk_box_pack_start( GTK_BOX( h ), w2, FALSE, FALSE, 0 );
-    data->label = l = gtk_label_new( NULL );
+    l = data->portLabel = gtk_label_new( _( "Status unknown" ) );
     gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
-    gtk_box_pack_start( GTK_BOX( h ), l, FALSE, FALSE, 0 );
-    hig_workarea_add_row( t, &row, _( "Listening _port:" ), h, w2 );
-
-    g_object_set_data( G_OBJECT( l ), "tr-port-spin", w2 );
-    g_object_set_data( G_OBJECT( l ), "session",
-                      tr_core_session( TR_CORE( core ) ) );
-    data->id = g_signal_connect( TR_CORE( core ), "prefs-changed",
-                                 G_CALLBACK( onCorePrefsChanged ), data );
-    onCorePrefsChanged( NULL, TR_PREFS_KEY_PEER_PORT, data );
+    gtk_box_pack_start_defaults( GTK_BOX( h ), l );
+    w = data->portButton = gtk_button_new_with_mnemonic( _( "_Test Port" ) );
+    gtk_box_pack_end( GTK_BOX( h ), w, FALSE, FALSE, 0 );
+    g_signal_connect( w, "clicked", G_CALLBACK(onPortTest), data );
+    hig_workarea_add_row( t, &row, NULL, h, NULL );
+    data->prefsTag = g_signal_connect( TR_CORE( core ), "prefs-changed", G_CALLBACK( onCorePrefsChanged ), data );
+    g_object_weak_ref( G_OBJECT( t ), networkPageDestroyed, data );
 
     s = _( "Randomize the port every launch" );
@@ -1385 +1313 @@
 
     hig_workarea_finish( t, &row );
-    g_object_weak_ref( G_OBJECT( t ), networkPageDestroyed, data );
-
     return t;
 }
@@ -1422 +1348 @@
                               gtk_label_new ( _( "Peers" ) ) );
     gtk_notebook_append_page( GTK_NOTEBOOK( n ),
+                              bandwidthPage( core ),
+                              gtk_label_new ( _( "Speed" ) ) );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ),
                               networkPage( core ),
                               gtk_label_new ( _( "Network" ) ) );
-    gtk_notebook_append_page( GTK_NOTEBOOK( n ),
-                              bandwidthPage( core ),
-                              gtk_label_new ( _( "Speed" ) ) );
     gtk_notebook_append_page( GTK_NOTEBOOK( n ),
                               desktopPage( core ),