Changeset 6374


Ignore:
Timestamp:
Jul 21, 2008, 4:09:14 PM (13 years ago)
Author:
charles
Message:

sync the remote and cli's encryption options. man page cleanup.

Location:
trunk/cli
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/cli.c

    r6334 r6374  
    445445    { 'd', "downlimit", "Set max download speed in KB/s", "d", 1, "<number>" },
    446446    { 'D', "no-downlimit", "Don't limit the download speed", "D", 0, NULL },
    447     { 'e', "encryption", "Set encryption mode (required, preferred, tolerated)",
    448       "e", 1, "<mode>" },
     447    { 910, "encryption-required", "Encrypt all peer connections", "er", 0, NULL },
     448    { 911, "encryption-preferred", "Prefer encrypted peer connections", "ep", 0, NULL },
     449    { 912, "encryption-tolerated", "Prefer unencrypted peer connections", "et", 0, NULL },
    449450    { 'f', "finish", "Set a script to run when the torrent finishes",
    450451      "f", 1, "<script>" },
     
    506507            case 'd': downloadLimit = numarg( optarg ); break;
    507508            case 'D': downloadLimit = -1; break;
    508             case 'e': if( !strcmp( optarg, "required" ) )
    509                           encryptionMode = TR_ENCRYPTION_REQUIRED;
    510                       else if( !strcmp( optarg, "tolerated" ) )
    511                           encryptionMode = TR_PLAINTEXT_PREFERRED;
    512                       else
    513                           encryptionMode = TR_ENCRYPTION_PREFERRED;
    514                       break;
    515509            case 'f': finishCall = optarg; break;
    516510            case 'g': configdir = optarg; break;
     
    527521            case 'v': verify = 1; break;
    528522            case 'w': downloadDir = optarg; break;
     523            case 910: encryptionMode = TR_ENCRYPTION_REQUIRED; break;
     524            case 911: encryptionMode = TR_PLAINTEXT_PREFERRED; break;
     525            case 912: encryptionMode = TR_ENCRYPTION_PREFERRED; break;
    529526            case TR_OPT_UNK: torrentPath = optarg; break;
    530527            default: return 1;
  • trunk/cli/transmissioncli.1

    r6300 r6374  
    1414.\"  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    1515.\"
    16 .Dd April 18, 2007
     16.Dd July 21, 2008
    1717.Dt TRANSMISSIONCLI 1
    1818.Os
     
    3737.Ar new-torrent-file
    3838.Nm
    39 .Op options
     39.Op Fl b | B
     40.Op Fl d Ar number | Fl D
     41.Op Fl er | ep | et
     42.Op Fl f Ar script
     43.Op Fl g Ar directory
     44.Op Fl h
     45.Op Fl m | M
     46.Op Fl p
     47.Op Fl t
     48.Op Fl u Ar number | Fl U
     49.Op Fl v
     50.Op Fl w Ar directory
    4051.Ar torrent-file
    4152.Ek
     
    6879Don't limit the download speed
    6980
    70 .It Fl e Fl -encryption Ar required
    71 Require all peer connections to be encrypted.
    72 .It Fl e Fl -encryption Ar preferred
     81.It Fl er Fl -encryption-required
     82Encrypt all peer connections.
     83.It Fl ep Fl -encryption-preferred
    7384Prefer encrypted peer connections.
    74 .It Fl e Fl -encryption Ar tolerated
     85.It Fl et Fl -encryption-tolerated
    7586Prefer unencrypted peer connections.
    7687
Note: See TracChangeset for help on using the changeset viewer.