Changeset 10646

Timestamp:

May 15, 2010, 1:46:46 PM (11 years ago)

Author:

charles

Message:

(trunk daemon) #3060 "local peer discovery" -- fix bugs reported by Eszet (thanks Eszet :)

Location:

trunk/daemon

Files:

• daemon.c (modified) (2 diffs)
• remote.c (modified) (3 diffs)
• transmission-remote.1 (modified) (2 diffs)

trunk/daemon/daemon.c

@@ -86 +86 @@
     { 'o', "dht", "Enable distributed hash tables (DHT)", "o", 0, NULL },
     { 'O', "no-dht", "Disable distributed hash tables (DHT)", "O", 0, NULL },
-    { 'z', "lds", "Enable local peer discovery (LPD)", "z", 0, NULL },
-    { 'Z', "no-lds", "Disable local peer discovery (LPD)", "Z", 0, NULL },
+    { 'y', "lpd", "Enable local peer discovery (LPD)", "y", 0, NULL },
+    { 'Y', "no-lpd", "Disable local peer discovery (LPD)", "Y", 0, NULL },
     { 'P', "peerport", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "P", 1, "<port>" },
     { 'm', "portmap", "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
@@ -409 +409 @@
                       tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
                       break;
-            case 'z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
-                      break;
-            case 'Z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
+            case 'y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
+                      break;
+            case 'Y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
                       break;
             default:  showUsage( );

trunk/daemon/remote.c

@@ -258 +258 @@
     { 'x', "pex",                    "Enable peer exchange (PEX)", "x",  0, NULL },
     { 'X', "no-pex",                 "Disable peer exchange (PEX)", "X",  0, NULL },
-    { 'z', "lds",                    "Enable local peer discovery (LPD)", "z",  0, NULL },
-    { 'Z', "no-lds",                 "Disable local peer discovery (LPD)", "Z",  0, NULL },
+    { 'y', "lpd",                    "Enable local peer discovery (LPD)", "y",  0, NULL },
+    { 'Y', "no-lpd",                 "Disable local peer discovery (LPD)", "Y",  0, NULL },
     { 940, "peer-info",              "List the current torrent(s)' peers", "pi",  0, NULL },
     {   0, NULL,                     NULL, NULL, 0, NULL }
@@ -328 +328 @@
         case 'x': /* pex */
         case 'X': /* no-pex */
-        case 'z': /* lds */
-        case 'Z': /* no-lds */
+        case 'y': /* lpd */
+        case 'Y': /* no-lpd */
         case 800: /* torrent-done-script */
         case 801: /* no-torrent-done-script */
@@ -1833 +1833 @@
                 case 'X': tr_bencDictAddBool( args, TR_PREFS_KEY_PEX_ENABLED, FALSE );
                           break;
-                case 'z': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, TRUE );
-                          break;
-                case 'Z': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, FALSE );
+                case 'y': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, TRUE );
+                          break;
+                case 'Y': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, FALSE );
                           break;
                 case 953: tr_bencDictAddReal( args, "seedRatioLimit", atof(optarg) );

trunk/daemon/transmission-remote.1

@@ -56 +56 @@
 .Op Fl w Ar download-dir
 .Op Fl x | X
-.Op Fl z | Z
+.Op Fl y | Y
 .Op Fl pi
 .Ek
@@ -254 +254 @@
 .It Fl X Fl -no-pex
 Disable peer exchange (PEX).
-.It Fl z Fl -lds
+.It Fl y Fl -lds
 Enable local peer discovery (LPD).
-.It Fl Z Fl -no-lds
+.It Fl Y Fl -no-lds
 Disable local peer discovery (LPD).
 .It Fl pi Fl -peer-info