Changeset 4305

Timestamp:

Dec 24, 2007, 3:48:42 AM (15 years ago)

Author:

livings124

Message:

get ipc fully working with ipc

Location:

trunk

Files:

• daemon/server.c (modified) (2 diffs)
• doc/ipcproto.txt (modified) (1 diff)
• macosx/Controller.m (modified) (2 diffs)
• macosx/IPCController.h (modified) (1 diff)
• macosx/IPCController.m (modified) (9 diffs)
• macosx/PrefsController.h (modified) (1 diff)
• macosx/PrefsController.m (modified) (1 diff)

trunk/daemon/server.c

@@ -639 +639 @@
     {
         case IPC_MSG_CRYPTO:
-            if(!strcasecmp(val->val.s.s, "preferred"))
+            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"))
@@ -931 +933 @@
             switch(torrent_get_encryption())
             {
+                case TR_PLAINTEXT_PREFERRED:
+                    strval = "plaintext";
+                    break;
                 case TR_ENCRYPTION_PREFERRED:
                     strval = "preferred";

trunk/doc/ipcproto.txt

@@ -199 +199 @@
          "encryption", "required"
 Details: Set the encryption mode for peer connections. Valid values
-         are "required" and "preferred".
+         are "required", "preferred" and "plaintext".
 
 Key:     "failed"

trunk/macosx/Controller.m

@@ -208 +208 @@
         fBadger = [[Badger alloc] initWithLib: fLib];
         
-        fIPCController = [[IPCController alloc] initWithHandle: fPrefsController];
+        fIPCController = [[IPCController alloc] init];
         [fIPCController setDelegate: self];
+        [fIPCController setPrefsController: fPrefsController];
         fRemoteQuit = NO;
         
@@ -2491 +2492 @@
         NSString * file;
         BOOL torrent = NO;
-        int canAdd;
         tr_ctor * ctor;
         while ((file = [enumerator nextObject]))

trunk/macosx/IPCController.h

@@ -59 +59 @@
 }
 
-- (id) initWithHandle: (PrefsController *) thePrefsController;
+
+- (id) init;
 - (id)      delegate;
 - (void) setDelegate: (id) newdelegate;
+- (void) setPrefsController: (id) thePrefsController;
 
 @end

trunk/macosx/IPCController.m

@@ -119 +119 @@
 @implementation IPCController
 
-- (id) initWithHandle : (PrefsController *) thePrefsController
-{
-    fPrefsController = thePrefsController;
+- (id) init
+{
     struct sockaddr_un sun;
 
@@ -151 +150 @@
         0 > ipc_addmsg( _funcs, IPC_MSG_AUTOMAP,      msg_setbool   ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_AUTOSTART,    msg_setbool   ) ||
+        0 > ipc_addmsg( _funcs, IPC_MSG_CRYPTO,       msg_setstr    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_DIR,          msg_setstr    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_DOWNLIMIT,    msg_setint    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_GETAUTOMAP,   msg_getbool   ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_GETAUTOSTART, msg_getbool   ) ||
+        0 > ipc_addmsg( _funcs, IPC_MSG_GETCRYPTO,    msg_getstr    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_GETDIR,       msg_getstr    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_GETDOWNLIMIT, msg_getint    ) ||
@@ -217 +218 @@
 }
 
+- (void) setPrefsController: (id) thePrefsController
+{
+    fPrefsController = thePrefsController;
+}
+
 @end
 
@@ -787 +793 @@
             break;
         case IPC_MSG_GETPEX:
-// we dont support this :(
+//warning we dont support this :(
             [client sendrespEmpty: IPC_MSG_FAIL tag: tag];
             break;
@@ -822 +828 @@
 {
     IPCClient * client = arg;
+    NSString    * cryptoValue;
 
     fDefaults = [NSUserDefaults standardUserDefaults];
@@ -831 +838 @@
             [client sendrespStr:IPC_MSG_DIR tag:tag val:[fDefaults stringForKey:@"DownloadFolder"]];
             break;
+            
+        case IPC_MSG_GETCRYPTO:
+            if ([fDefaults boolForKey: @"EncryptionPrefer"])
+                if ([fDefaults boolForKey: @"EncryptionRequire"])
+                    cryptoValue = @"required";
+                else
+                    cryptoValue = @"preferred";
+            else
+                cryptoValue = @"plaintext";
+            
+            [client sendrespStr:IPC_MSG_CRYPTO tag:tag val:cryptoValue];
+            break;
+            
         default:
             assert( 0 );
@@ -861 +881 @@
             break;
         case IPC_MSG_PEX:
-        //we dont support this :(
+//warning we dont support this :(
             [client sendrespEmpty: IPC_MSG_FAIL tag: tag];
             break;
@@ -890 +910 @@
             break;
         case IPC_MSG_PORT:
-#warning show in preference window
             [fPrefsController setPort:[NSNumber numberWithInt:val->val.i]];
+            [fPrefsController updatePortField];
             break;
         case IPC_MSG_UPLIMIT:
@@ -925 +945 @@
              [client sendrespEmpty: IPC_MSG_OK tag: tag];
              break;
+            
+        case IPC_MSG_CRYPTO:
+            if(!strcasecmp(val->val.s.s, "required"))
+            {
+                [fDefaults setBool:TRUE  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:TRUE  forKey: @"EncryptionRequire"];
+            }
+            
+            else if(!strcasecmp(val->val.s.s, "preferred"))
+            {
+                [fDefaults setBool:TRUE  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:FALSE  forKey: @"EncryptionRequire"];
+            }
+            
+            else if(!strcasecmp(val->val.s.s, "plaintext"))
+            {
+                [fDefaults setBool:FALSE  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:FALSE  forKey: @"EncryptionRequire"];
+            }
+            
+            [client sendrespEmpty: IPC_MSG_OK tag: tag];
+            break;
+           
         default:
              assert( 0 );

trunk/macosx/PrefsController.h

@@ -62 +62 @@
 - (void) setUpdater: (SUUpdater *) updater;
 
+- (void) updatePortField;
 - (void) setPort: (id) sender;
 - (void) setNat: (id) sender;

trunk/macosx/PrefsController.m

@@ -223 +223 @@
 }
 
+//used by ipc
+- (void) updatePortField
+{
+    [fPortField setIntValue: [fDefaults integerForKey: @"BindPort"]];
+}
+
 - (void) setPort: (id) sender
 {