Changeset 10646


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/daemon/daemon.c

    r10635 r10646  
    8686    { 'o', "dht", "Enable distributed hash tables (DHT)", "o", 0, NULL },
    8787    { 'O', "no-dht", "Disable distributed hash tables (DHT)", "O", 0, NULL },
    88     { 'z', "lds", "Enable local peer discovery (LPD)", "z", 0, NULL },
    89     { 'Z', "no-lds", "Disable local peer discovery (LPD)", "Z", 0, NULL },
     88    { 'y', "lpd", "Enable local peer discovery (LPD)", "y", 0, NULL },
     89    { 'Y', "no-lpd", "Disable local peer discovery (LPD)", "Y", 0, NULL },
    9090    { 'P', "peerport", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "P", 1, "<port>" },
    9191    { 'm', "portmap", "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
     
    409409                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
    410410                      break;
    411             case 'z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
    412                       break;
    413             case 'Z': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
     411            case 'y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
     412                      break;
     413            case 'Y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
    414414                      break;
    415415            default:  showUsage( );
  • trunk/daemon/remote.c

    r10640 r10646  
    258258    { 'x', "pex",                    "Enable peer exchange (PEX)", "x",  0, NULL },
    259259    { 'X', "no-pex",                 "Disable peer exchange (PEX)", "X",  0, NULL },
    260     { 'z', "lds",                    "Enable local peer discovery (LPD)", "z",  0, NULL },
    261     { 'Z', "no-lds",                 "Disable local peer discovery (LPD)", "Z",  0, NULL },
     260    { 'y', "lpd",                    "Enable local peer discovery (LPD)", "y",  0, NULL },
     261    { 'Y', "no-lpd",                 "Disable local peer discovery (LPD)", "Y",  0, NULL },
    262262    { 940, "peer-info",              "List the current torrent(s)' peers", "pi",  0, NULL },
    263263    {   0, NULL,                     NULL, NULL, 0, NULL }
     
    328328        case 'x': /* pex */
    329329        case 'X': /* no-pex */
    330         case 'z': /* lds */
    331         case 'Z': /* no-lds */
     330        case 'y': /* lpd */
     331        case 'Y': /* no-lpd */
    332332        case 800: /* torrent-done-script */
    333333        case 801: /* no-torrent-done-script */
     
    18331833                case 'X': tr_bencDictAddBool( args, TR_PREFS_KEY_PEX_ENABLED, FALSE );
    18341834                          break;
    1835                 case 'z': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, TRUE );
    1836                           break;
    1837                 case 'Z': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, FALSE );
     1835                case 'y': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, TRUE );
     1836                          break;
     1837                case 'Y': tr_bencDictAddBool( args, TR_PREFS_KEY_LPD_ENABLED, FALSE );
    18381838                          break;
    18391839                case 953: tr_bencDictAddReal( args, "seedRatioLimit", atof(optarg) );
  • trunk/daemon/transmission-remote.1

    r10640 r10646  
    5656.Op Fl w Ar download-dir
    5757.Op Fl x | X
    58 .Op Fl z | Z
     58.Op Fl y | Y
    5959.Op Fl pi
    6060.Ek
     
    254254.It Fl X Fl -no-pex
    255255Disable peer exchange (PEX).
    256 .It Fl z Fl -lds
     256.It Fl y Fl -lds
    257257Enable local peer discovery (LPD).
    258 .It Fl Z Fl -no-lds
     258.It Fl Y Fl -no-lds
    259259Disable local peer discovery (LPD).
    260260.It Fl pi Fl -peer-info
Note: See TracChangeset for help on using the changeset viewer.