Changeset 5913

Timestamp:

May 23, 2008, 4:18:58 PM (15 years ago)

Author:

charles

Message:

sine we now have two public ports (peer and rpc), rename "publicPort" as "peerPort"

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• gtk/main.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (4 diffs)
• libtransmission/peer-msgs.c (modified) (1 diff)
• libtransmission/port-forwarding.c (modified) (1 diff)
• libtransmission/port-forwarding.h (modified) (1 diff)
• libtransmission/rpc.c (modified) (2 diffs)
• libtransmission/session.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/tracker.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/PrefsController.h (modified) (1 diff)
• macosx/PrefsController.m (modified) (3 diffs)

trunk/daemon/daemon.c

@@ -44 +44 @@
     tr_bencDictAddInt( &d, "peer-limit", tr_sessionGetPeerLimit( h ) );
     tr_bencDictAddInt( &d, "pex-allowed", tr_sessionIsPexEnabled( h ) );
-    tr_bencDictAddInt( &d, "port", tr_sessionGetPublicPort( h ) );
+    tr_bencDictAddInt( &d, "port", tr_sessionGetPeerPort( h ) );
     tr_bencDictAddInt( &d, "port-forwarding-enabled",
                            tr_sessionIsPortForwardingEnabled( h ) );

trunk/gtk/main.c

@@ -894 +894 @@
     {
         const int port = pref_int_get( key );
-        tr_sessionSetPublicPort( tr, port );
+        tr_sessionSetPeerPort( tr, port );
     }
     else if( !strcmp( key, PREF_KEY_DL_LIMIT_ENABLED ) )

trunk/gtk/tr-prefs.c

@@ -534 +534 @@
 
     hig_workarea_add_section_title (t, &row, _( "Ports" ) );
-        
-        s = _("_Forward port from router" );
-        w = new_check_button( s, PREF_KEY_NAT, core );
-        hig_workarea_add_wide_control( t, &row, w );
 
         h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
@@ -545 +541 @@
         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, _("Incoming _port:"), h, w );
+        hig_workarea_add_row( t, &row, _("Listen for _peers on port:"), h, w );
 
         g_object_set_data( G_OBJECT(l), "tr-port-spin", w2 );
@@ -551 +547 @@
         g_object_set_data( G_OBJECT(l), "handle", tr_core_handle( TR_CORE( core ) ) );
         testing_port_cb( NULL, l );
-
-        g_signal_connect( w, "toggled", G_CALLBACK(testing_port_cb), l );
-        g_signal_connect( w2, "value-changed", G_CALLBACK(testing_port_cb), l );
 
         s = _( "Listen for _RPC requests on port:" );
@@ -561 +554 @@
         g_signal_connect( w, "toggled", G_CALLBACK(target_cb), w2 );
         hig_workarea_add_row_w( t, &row, w, w2, NULL );
+        
+        s = _("_Forward these port(s) from my router" );
+        w = new_check_button( s, PREF_KEY_NAT, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+        g_signal_connect( w, "toggled", G_CALLBACK(testing_port_cb), l );
+        g_signal_connect( w2, "value-changed", G_CALLBACK(testing_port_cb), l );
 
     hig_workarea_finish( t, &row );

trunk/libtransmission/peer-msgs.c

@@ -872 +872 @@
     tr_bencInitDict( &val, 4 );
     tr_bencDictAddInt( &val, "e", msgs->handle->encryptionMode != TR_PLAINTEXT_PREFERRED );
-    tr_bencDictAddInt( &val, "p", tr_sessionGetPublicPort( msgs->handle ) );
+    tr_bencDictAddInt( &val, "p", tr_sessionGetPeerPort( msgs->handle ) );
     tr_bencDictAddStr( &val, "v", TR_NAME " " USERAGENT_PREFIX );
     m  = tr_bencDictAddDict( &val, "m", 1 );

trunk/libtransmission/port-forwarding.c

@@ -215 +215 @@
 
 int
-tr_sharedGetPublicPort( const tr_shared * s )
+tr_sharedGetPeerPort( const tr_shared * s )
 {
     return s->publicPort;

trunk/libtransmission/port-forwarding.h

@@ -30 +30 @@
 typedef struct tr_shared tr_shared;
 
-tr_shared* tr_sharedInit              ( tr_handle *, int isEnabled,
-                                                     int publicPort );
-void       tr_sharedShuttingDown      ( tr_shared * );
-void       tr_sharedSetPort           ( tr_shared *, int publicPort );
-void       tr_sharedTraversalEnable   ( tr_shared *, int isEnabled );
-int        tr_sharedGetPublicPort     ( const tr_shared * s );
-int        tr_sharedTraversalIsEnabled( const tr_shared * s );
-int        tr_sharedTraversalStatus ( const tr_shared * );
+tr_shared* tr_sharedInit               ( tr_handle *, int isEnabled,
+                                                      int publicPort );
+void       tr_sharedShuttingDown       ( tr_shared * );
+void       tr_sharedSetPort            ( tr_shared *, int publicPort );
+void       tr_sharedTraversalEnable    ( tr_shared *, int isEnabled );
+int        tr_sharedGetPeerPort        ( const tr_shared * s );
+int        tr_sharedTraversalIsEnabled ( const tr_shared * s );
+int        tr_sharedTraversalStatus    ( const tr_shared * );
 
 #endif

trunk/libtransmission/rpc.c

@@ -593 +593 @@
         tr_sessionSetPexEnabled( h, i );
     if( tr_bencDictFindInt( args_in, "port", &i ) )
-        tr_sessionSetPublicPort( h, i );
+        tr_sessionSetPeerPort( h, i );
     if( tr_bencDictFindInt( args_in, "port-forwarding-enabled", &i ) )
         tr_sessionSetPortForwardingEnabled( h, i );
@@ -631 +631 @@
                           tr_sessionIsPexEnabled( h ) );
     tr_bencDictAddInt( d, "port",
-                          tr_sessionGetPublicPort( h ) );
+                          tr_sessionGetPeerPort( h ) );
     tr_bencDictAddInt( d, "port-forwarding-enabled",
                           tr_sessionIsPortForwardingEnabled( h ) );

trunk/libtransmission/session.c

@@ -301 +301 @@
 
 void
-tr_sessionSetPublicPort( tr_handle * handle, int port )
+tr_sessionSetPeerPort( tr_handle * handle, int port )
 {
     struct bind_port_data * data = tr_new( struct bind_port_data, 1 );
@@ -310 +310 @@
 
 int
-tr_sessionGetPublicPort( const tr_handle * h )
+tr_sessionGetPeerPort( const tr_handle * h )
 {
     assert( h != NULL );
-    return tr_sharedGetPublicPort( h->shared );
+    return tr_sharedGetPeerPort( h->shared );
 }
 

trunk/libtransmission/torrent.c

@@ -465 +465 @@
 
     if( !h->isPortSet )
-        tr_sessionSetPublicPort( h, TR_DEFAULT_PORT );
+        tr_sessionSetPeerPort( h, TR_DEFAULT_PORT );
 
     assert( !tor->downloadedCur );

trunk/libtransmission/tracker.c

@@ -22 +22 @@
 #include "completion.h"
 #include "net.h"
-#include "port-forwarding.h"
 #include "publish.h"
 #include "torrent.h"
@@ -588 +587 @@
         t->escaped,
         t->peer_id,
-        tr_sharedGetPublicPort( t->session->shared ),
+        tr_sessionGetPeerPort( t->session ),
         torrent->uploadedCur,
         torrent->downloadedCur,

trunk/libtransmission/transmission.h

@@ -278 +278 @@
 int tr_sessionIsPortForwardingEnabled( const tr_handle * );
 
-void tr_sessionSetPublicPort( tr_handle *, int );
-
-int tr_sessionGetPublicPort( const tr_handle * );
+void tr_sessionSetPeerPort( tr_handle *, int );
+
+int tr_sessionGetPeerPort( const tr_handle * );
 
 typedef enum

trunk/macosx/PrefsController.h

@@ -56 +56 @@
     IBOutlet NSProgressIndicator * fPortStatusProgress;
     NSTimer * fPortStatusTimer;
-    int fPublicPort, fNatStatus;
+    int fPeerPort, fNatStatus;
 }
 

trunk/macosx/PrefsController.m

@@ -249 +249 @@
     int port = [sender intValue];
     [fDefaults setInteger: port forKey: @"BindPort"];
-    tr_sessionSetPublicPort(fHandle, port);
-    
-    fPublicPort = -1;
+    tr_sessionSetPeerPort(fHandle, port);
+    
+    fPeerPort = -1;
     [self updatePortStatus];
 }
@@ -266 +266 @@
 {
     const tr_port_forwarding fwd = tr_sessionGetPortForwarding(fHandle);
-    const int port = tr_sessionGetPublicPort(fHandle);
-
-    if (fNatStatus != fwd || fPublicPort != port )
+    const int port = tr_sessionGetPeerPort(fHandle);
+
+    if (fNatStatus != fwd || fPeerPort != port )
     {
         fNatStatus = fwd;
-        fPublicPort = port;
+        fPeerPort = port;
         
         [fPortStatusField setStringValue: [NSLocalizedString(@"Checking port status", "Preferences -> Network -> port status")
@@ -283 +283 @@
             [fPortChecker release];
         }
-        fPortChecker = [[PortChecker alloc] initForPort: fPublicPort withDelegate: self];
+        fPortChecker = [[PortChecker alloc] initForPort: fPeerPort withDelegate: self];
     }
 }