Changeset 3578 for trunk/daemon/remote.c

Timestamp:

Oct 26, 2007, 3:43:27 AM (15 years ago)

Author:

joshe

Message:

Add IPC messages to set and retrieve the encryption mode.
Implement encryption mode messages in -daemon and -remote.

File:

• trunk/daemon/remote.c (modified) (5 diffs)

trunk/daemon/remote.c

@@ -73 +73 @@
     char              dir[MAXPATHLEN];
     int               pex;
+    const char *      crypto;
 };
 
@@ -175 +176 @@
         ( '\0' != o.dir[0]          &&   0 > client_dir      ( o.dir     ) ) ||
         ( !SLIST_EMPTY( &o.files )  &&   0 > client_addfiles ( &o.files  ) ) ||
+        ( o.crypto                  &&   0 > client_crypto   ( o.crypto  ) ) ||
         ( o.startall                &&   0 > client_start    ( 0, NULL   ) ) ||
         ( o.stopall                 &&   0 > client_stop     ( 0, NULL   ) ) ||
@@ -230 +232 @@
   "\n"
   "  -a --add <torrent>        Add a torrent\n"
+  "  -c --encryption preferred Prefer peers to use encryption\n"
+  "  -c --encryption required  Require encryption for all peers\n"
   "  -d --download-limit <int> Max download rate in KiB/s\n"
   "  -D --download-unlimited   No download rate limit\n"
@@ -261 +265 @@
 readargs( int argc, char ** argv, struct opts * opts )
 {
-    char optstr[] = "a:d:DeEf:hilmMp:qr:s:S:t:u:Ux";
+    char optstr[] = "a:c:d:DeEf:hilmMp:qr:s:S:t:u:Ux";
     struct option longopts[] =
     {
         { "add",                required_argument, NULL, 'a' },
+        { "encryption",         required_argument, NULL, 'c' },
         { "download-limit",     required_argument, NULL, 'd' },
         { "download-unlimited", no_argument,       NULL, 'D' },
@@ -307 +312 @@
                     return -1;
                 }
+                break;
+            case 'c':
+                if(!strcasecmp(optarg, "preferred"))
+                    opts->crypto = "preferred";
+                else if(!strcasecmp(optarg, "required"))
+                    opts->crypto = "required";
+                else
+                    usage("invalid encryption mode: %s", optarg);
                 break;
             case 'd':