From 5f2d3b022e2b9bddeca1972b39a8fca7cba7a051 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Thu, 27 Dec 2007 05:07:40 +0000
Subject: [PATCH] ipc update to ensure unlimited bandwidth is set correctly

---
 macosx/English.lproj/Localizable.strings | Bin 50406 -> 50526 bytes
 macosx/IPCController.m                   |  48 +++++++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index 3fa0d7fef4239e7ab3b28efb24f035fcab286342..4ad57d600203d9101f9b2c098c53ffdf116be6c8 100644
GIT binary patch
delta 214
zcmaFX$$YPid4q!EWB~`6$s4jICi^&bOpa+a0Q2h{XH6E67Mgr(gUDp57?I6?oF1@G
zzM~a4d4rq4<ODB{$^X1VCL82COqTIJuz8t}m^9dgri_Hi4jEdL>l{@kKS)oQ{2^a&
zvp{AE-()QjE@>x*M1~ZGbcR%hA_fHpT?RWKS;$bzkjYRo*>RTi<d|{}=@K9>52!{7
wC}#`AN(_Mz6+kuGp01Pq;y5<%DYx?gJH_gN$YhR#9$;r!9f;W+aBvzk0JF?VrvLx|

delta 165
zcmccD#r&+3d4q!EWC3ZR$#v~wlV7z;O%`yFne0%lGTFg_XL5v7)?@|8J)5sMad1pF
z$ak3h$3twgfsfeacQqW7^SmV{|MM1^bcAQ}9j{Z9?`VZ=Ugjev4c6S0kudpy8rNjI
z428)XvLz;8Nl%#kAzyE^KxPTwWCu@!$$oJhn@uY0Jiw;r9E<^KkDGkqKnzgQYVw&w
PVw2+zX>4{lB*zQ@pzlOw

diff --git a/macosx/IPCController.m b/macosx/IPCController.m
index 202b8dba0..64776be1f 100644
--- a/macosx/IPCController.m
+++ b/macosx/IPCController.m
@@ -408,7 +408,7 @@ PrefsController         * fPrefsController;
 
     buf = ipc_mkempty( _ipc, &size, msgid, tag );
     if( NULL == buf )
-        return FALSE;
+        return NO;
 
     return [self sendresp: buf
                      size: size];
@@ -423,7 +423,7 @@ PrefsController         * fPrefsController;
 
     buf = ipc_mkint( _ipc, &size, msgid, tag, val );
     if( NULL == buf )
-        return FALSE;
+        return NO;
 
     return [self sendresp: buf
                      size: size];
@@ -451,7 +451,7 @@ PrefsController         * fPrefsController;
         buf = ipc_mkstr( _ipc, &size, msgid, tag, [sucky bytes] );
     }
     if( NULL == buf )
-        return FALSE;
+        return NO;
 
     return [self sendresp: buf
                      size: size];
@@ -807,16 +807,26 @@ void msg_getint( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
     
     fDefaults = [NSUserDefaults standardUserDefaults];
     
+    int theValue;
+    
     switch( msgid )
     {
         case IPC_MSG_GETDOWNLIMIT:
-            [client sendrespInt:IPC_MSG_DOWNLIMIT tag:tag val:[fDefaults integerForKey:@"DownloadLimit"]];
+            if ( [fDefaults boolForKey:@"CheckDownload"] )
+                theValue = [fDefaults integerForKey:@"DownloadLimit"];
+            else
+                theValue = -1;
+            [client sendrespInt:IPC_MSG_DOWNLIMIT tag:tag val:theValue];
             break;
         case IPC_MSG_GETPORT:
             [client sendrespInt:IPC_MSG_PORT tag:tag val:[fDefaults integerForKey:@"BindPort"]];
             break;
         case IPC_MSG_GETUPLIMIT:
-            [client sendrespInt:IPC_MSG_UPLIMIT tag:tag val:[fDefaults integerForKey:@"UploadLimit"]];
+            if ( [fDefaults boolForKey:@"CheckUpload"] )
+                theValue = [fDefaults integerForKey:@"UploadLimit"];
+            else
+                theValue = -1;
+            [client sendrespInt:IPC_MSG_UPLIMIT tag:tag val:theValue];
             break;
         default:
             assert( 0 );
@@ -904,7 +914,13 @@ void msg_setint( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
     switch( msgid )
     {
         case IPC_MSG_DOWNLIMIT:
-            [fDefaults setInteger:val->val.i forKey:@"DownloadLimit"];
+            if ( val->val.i < 0 )
+                [fDefaults setBool:NO forKey:@"CheckDownload"];
+            else
+            {
+                [fDefaults setBool:YES forKey:@"CheckDownload"];
+                [fDefaults setInteger:val->val.i forKey:@"DownloadLimit"];
+            }
             [fPrefsController updateLimitFields];
             [fPrefsController applySpeedSettings: nil];
             break;
@@ -913,7 +929,13 @@ void msg_setint( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
             [fPrefsController updatePortField];
             break;
         case IPC_MSG_UPLIMIT:
-            [fDefaults setInteger:val->val.i forKey:@"UploadLimit"];
+            if ( val->val.i < 0 )
+                [fDefaults setBool:NO forKey:@"CheckUpload"];
+            else
+            {
+                [fDefaults setBool:YES forKey:@"CheckUpload"];
+                [fDefaults setInteger:val->val.i forKey:@"UploadLimit"];
+            }
             [fPrefsController updateLimitFields];
             [fPrefsController applySpeedSettings: nil];
             break;
@@ -948,20 +970,20 @@ void msg_setstr( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
         case IPC_MSG_CRYPTO:
             if(!strcasecmp(val->val.s.s, "required"))
             {
-                [fDefaults setBool:TRUE  forKey: @"EncryptionPrefer"];
-                [fDefaults setBool:TRUE  forKey: @"EncryptionRequire"];
+                [fDefaults setBool:YES  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:YES  forKey: @"EncryptionRequire"];
             }
             
             else if(!strcasecmp(val->val.s.s, "preferred"))
             {
-                [fDefaults setBool:TRUE  forKey: @"EncryptionPrefer"];
-                [fDefaults setBool:FALSE  forKey: @"EncryptionRequire"];
+                [fDefaults setBool:YES  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:NO  forKey: @"EncryptionRequire"];
             }
             
             else if(!strcasecmp(val->val.s.s, "plaintext"))
             {
-                [fDefaults setBool:FALSE  forKey: @"EncryptionPrefer"];
-                [fDefaults setBool:FALSE  forKey: @"EncryptionRequire"];
+                [fDefaults setBool:NO  forKey: @"EncryptionPrefer"];
+                [fDefaults setBool:NO  forKey: @"EncryptionRequire"];
             }
             
             [client sendrespEmpty: IPC_MSG_OK tag: tag];