Changeset 5514

Timestamp:

Apr 5, 2008, 4:32:09 PM (14 years ago)

Author:

charles

Message:

finish documentation for the "encryption" message and add an option for "plaintext preferred" to transmission-remote

Location:

trunk

Files:

• daemon/remote.c (modified) (2 diffs)
• daemon/server.c (modified) (2 diffs)
• doc/ipcproto.txt (modified) (2 diffs)

trunk/daemon/remote.c

@@ -237 +237 @@
   "\n"
   "  -a --add <torrent>        Add a torrent\n"
+  "  -c --encryption required  Require encryption for all peers\n"
   "  -c --encryption preferred Prefer peers to use encryption\n"
-  "  -c --encryption required  Require encryption for all peers\n"
+  "  -c --encryption tolerated Prefer peers to use plaintext\n"
   "  -d --download-limit <int> Max download rate in KiB/s\n"
   "  -D --download-unlimited   No download rate limit\n"
@@ -321 +322 @@
                 break;
             case 'c':
-                if(!strcasecmp(optarg, "preferred"))
+                if(!strcasecmp(optarg, "required"))
+                    opts->crypto = "required";
+                else if(!strcasecmp(optarg, "preferred"))
                     opts->crypto = "preferred";
-                else if(!strcasecmp(optarg, "required"))
-                    opts->crypto = "required";
+                else if(!strcasecmp(optarg, "tolerated"))
+                    opts->crypto = "tolerated";
                 else
                     usage("invalid encryption mode: %s", optarg);

trunk/daemon/server.c

@@ -634 +634 @@
     {
         case IPC_MSG_CRYPTO:
-            if(!strcasecmp(val->val.s.s, "plaintext"))
-                torrent_set_encryption(TR_PLAINTEXT_PREFERRED);
-            else if(!strcasecmp(val->val.s.s, "preferred"))
-                torrent_set_encryption(TR_ENCRYPTION_PREFERRED);
-            else if(!strcasecmp(val->val.s.s, "required"))
-                torrent_set_encryption(TR_ENCRYPTION_REQUIRED);
-            else
-            {
+            if( !strcasecmp( val->val.s.s, "required" ) )
+                torrent_set_encryption( TR_ENCRYPTION_REQUIRED );
+            else if( !strcasecmp( val->val.s.s, "preferred" ) )
+                torrent_set_encryption( TR_ENCRYPTION_PREFERRED );
+            else if( !strcasecmp( val->val.s.s, "tolerated" ) )
+                torrent_set_encryption( TR_PLAINTEXT_PREFERRED );
+            else {
                 msgresp(client, tag, IPC_MSG_BAD);
                 return;
             }
             break;
+
         case IPC_MSG_DIR:
             torrent_set_directory( val->val.s.s );
@@ -928 +928 @@
             break;
         case IPC_MSG_GETCRYPTO:
-            switch(torrent_get_encryption())
-            {
-                case TR_PLAINTEXT_PREFERRED:
-                    strval = "plaintext";
-                    break;
-                case TR_ENCRYPTION_PREFERRED:
-                    strval = "preferred";
-                    break;
-                case TR_ENCRYPTION_REQUIRED:
-                    strval = "required";
-                    break;
-                default:
-                    assert(0);
-                    return;
+            switch(torrent_get_encryption()) {
+                case TR_ENCRYPTION_REQUIRED:  strval = "required"; break;
+                case TR_ENCRYPTION_PREFERRED: strval = "preferred"; break;
+                case TR_PLAINTEXT_PREFERRED:  strval = "tolerated"; break;
+                default: assert(0); return;
             }
             buf = ipc_mkstr(client->ipc, &buflen, IPC_MSG_CRYPTO, tag, strval);

trunk/doc/ipcproto.txt

@@ -269 +269 @@
 Example: 12:get-info-alll4:hash4:namee
          "get-info-all", ("hash", "name")
-Details: Same as "getinfo" message with all torrent IDs specified.
+Details: Same as "get-info" message with all torrent IDs specified.
 
 Key:     "get-pex"
@@ -375 +375 @@
 Details: Change the port the server uses to listen for incoming peer
          connections.
+
+Key:     "encryption"
+Version: 2
+Format:  string
+Example: 10:encryption9:preferred
+         "encryption", "preferred"
+Details: Returns thestring is one of:
+         "required", "preferred", "tolerated"
 
 Key:     "quit"