mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

add an option to disable Bonjour broadcasting of the web ui link

This commit is contained in:
Mitchell Livingston 2008-12-06 02:59:04 +00:00
parent 76ce949419
commit 399485bf6c
5 changed files with 129 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/Controller.m
View File

@ -524,7 +524,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[self checkAutoImportDirectory];
//registering the Web UI to Bonjour
if ([fDefaults boolForKey: @"RPC"])
if ([fDefaults boolForKey: @"RPC"] && [fDefaults boolForKey: @"RPCWebDiscovery"])
[[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]];
}

8
macosx/Defaults.plist
View File

@ -120,6 +120,10 @@
<false/>
<key>QueueSeedNumber</key>
<integer>3</integer>
<key>RatioCheck</key>
<false/>
<key>RatioLimit</key>
<integer>2</integer>
<key>RPC</key>
<false/>
<key>RPCAuthorize</key>
@ -130,10 +134,8 @@
<integer>9091</integer>
<key>RPCUsername</key>
<string>admin</string>
<key>RatioCheck</key>
<key>RPCWebDiscovery</key>
<false/>
<key>RatioLimit</key>
<integer>2</integer>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SeedingSound</key>

1
macosx/PrefsController.h
View File

@ -133,6 +133,7 @@
- (void) updateRPCPassword;
- (void) setRPCPort: (id) sender;
- (void) setRPCUseWhitelist: (id) sender;
- (void) setRPCWebUIDiscovery: (id) sender;
- (void) updateRPCWhitelist;
- (void) addRemoveRPCIP: (id) sender;

18
macosx/PrefsController.m
View File

@ -823,11 +823,7 @@ tr_handle * fHandle;
BOOL enable = [fDefaults boolForKey: @"RPC"];
tr_sessionSetRPCEnabled(fHandle, enable);
//Registering the Web UI to Bonjour
if (enable)
[[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]];
else
[[BonjourController defaultController] stop];
[self setRPCWebUIDiscovery: nil];
}
- (void) linkWebUI: (id) sender
@ -879,9 +875,7 @@ tr_handle * fHandle;
[fDefaults setInteger: port forKey: @"RPCPort"];
tr_sessionSetRPCPort(fHandle, port);
//Registering the Web UI to Bonjour
if ([fDefaults boolForKey:@"RPC"])
[[BonjourController defaultController] startWithPort: port];
[self setRPCWebUIDiscovery: nil];
}
- (void) setRPCUseWhitelist: (id) sender
@ -889,6 +883,14 @@ tr_handle * fHandle;
tr_sessionSetRPCWhitelistEnabled(fHandle, [fDefaults boolForKey: @"RPCUseWhitelist"]);
}
- (void) setRPCWebUIDiscovery: (id) sender
{
if ([fDefaults boolForKey:@"RPC"] && [fDefaults boolForKey: @"RPCWebDiscovery"])
[[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]];
else
[[BonjourController defaultController] stop];
}
- (void) updateRPCWhitelist
{
NSString * string = [fRPCWhitelistArray componentsJoinedByString: @","];

138
macosx/en.lproj/PrefsWindow.xib
View File

@ -8,8 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="66"/>
<integer value="1760"/>
<integer value="1481"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1527,7 +1526,7 @@
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="284666863">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -3047,7 +3046,6 @@ zXXNhs2mzcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj
</object>
<string key="NSFrame">{{1, 1}, {141, 169}}</string>
<reference key="NSSuperview" ref="544077474"/>
<reference key="NSNextKeyView" ref="638525082"/>
<reference key="NSDocView" ref="638525082"/>
<reference key="NSBGColor" ref="729660797"/>
<int key="NScvFlags">4</int>
@ -3075,7 +3073,6 @@ zXXNhs2mzcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj
</object>
<string key="NSFrame">{{20, 49}, {143, 171}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSNextKeyView" ref="568562479"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="287972127"/>
<reference key="NSHScroller" ref="781866080"/>
@ -3284,7 +3281,6 @@ zXXNhs2mzcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj
</object>
</object>
<string key="NSFrameSize">{535, 240}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="352903881">
@ -4340,7 +4336,7 @@ AAABAAAAAQ</bytes>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="204700639">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -4926,19 +4922,18 @@ AAABAAAAAQ</bytes>
</object>
</object>
<string key="NSFrameSize">{535, 319}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="810116101">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="712370553">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{100, 220}, {96, 17}}</string>
<string key="NSFrame">{{77, 254}, {96, 17}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="957501329">
@ -4954,7 +4949,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="966253460">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{123, 262}, {68, 17}}</string>
<string key="NSFrame">{{100, 296}, {68, 17}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="404750455">
@ -4970,7 +4965,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="1807399">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{120, 288}, {71, 17}}</string>
<string key="NSFrame">{{97, 322}, {71, 17}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="705209842">
@ -4986,7 +4981,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="485614707">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{202, 218}, {50, 22}}</string>
<string key="NSFrame">{{179, 252}, {50, 22}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="754049708">
@ -5052,7 +5047,7 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="898169443">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{82, 407}, {158, 18}}</string>
<string key="NSFrame">{{59, 441}, {158, 18}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="844429646">
@ -5071,10 +5066,32 @@ AAABAAAAAQ</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="3575">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{78, 34}, {398, 18}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="105041185">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Display the web interface on the local network with Bonjour</string>
<reference key="NSSupport" ref="86725571"/>
<reference key="NSControlView" ref="3575"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="1001726176"/>
<reference key="NSAlternateImage" ref="764913887"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="151618662">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{101, 312}, {165, 18}}</string>
<string key="NSFrame">{{78, 346}, {165, 18}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="658673085">
@ -5096,7 +5113,7 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="264419599">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{101, 182}, {332, 18}}</string>
<string key="NSFrame">{{78, 216}, {332, 18}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="958039142">
@ -5118,7 +5135,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="535988411">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{100, 391}, {318, 14}}</string>
<string key="NSFrame">{{77, 425}, {318, 14}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="644224844">
@ -5134,7 +5151,7 @@ AAABAAAAAQ</bytes>
<object class="NSSecureTextField" id="894846458">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{196, 260}, {184, 22}}</string>
<string key="NSFrame">{{173, 294}, {184, 22}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="38151087">
@ -5268,7 +5285,7 @@ AAABAAAAAQ</bytes>
</object>
<reference ref="1018053122"/>
</object>
<string key="NSFrame">{{123, 63}, {308, 113}}</string>
<string key="NSFrame">{{100, 97}, {308, 113}}</string>
<reference key="NSSuperview" ref="810116101"/>
<reference key="NSNextKeyView" ref="206862330"/>
<int key="NSsFlags">18</int>
@ -5282,7 +5299,7 @@ AAABAAAAAQ</bytes>
<object class="NSSegmentedControl" id="432022023">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{123, 35}, {67, 23}}</string>
<string key="NSFrame">{{100, 69}, {67, 23}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="1040339170">
@ -5314,7 +5331,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="189299072">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 39}, {196, 14}}</string>
<string key="NSFrame">{{172, 73}, {196, 14}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="159713069">
@ -5330,7 +5347,7 @@ AAABAAAAAQ</bytes>
<object class="NSTextField" id="717982135">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{196, 286}, {184, 22}}</string>
<string key="NSFrame">{{173, 320}, {184, 22}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="80231199">
@ -5367,7 +5384,7 @@ AAABAAAAAQ</bytes>
<object class="NSButton" id="52925771">
<reference key="NSNextResponder" ref="810116101"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{103, 347}, {149, 25}}</string>
<string key="NSFrame">{{80, 381}, {149, 25}}</string>
<reference key="NSSuperview" ref="810116101"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="853520292">
@ -5386,11 +5403,17 @@ AAABAAAAAQ</bytes>
</object>
</object>
</object>
<string key="NSFrameSize">{535, 443}</string>
<string key="NSFrameSize">{535, 477}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSUserDefaultsController" id="356871564">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>RPC</string>
<string>RPCWebDiscovery</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomObject" id="981493640">
@ -8471,6 +8494,46 @@ AAABAAAAAQ</bytes>
</object>
<int key="connectionID">1822</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: values.RPC</string>
<reference key="source" ref="3575"/>
<reference key="destination" ref="356871564"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="3575"/>
<reference key="NSDestination" ref="356871564"/>
<string key="NSLabel">enabled: values.RPC</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">values.RPC</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1827</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.RPCWebDiscovery</string>
<reference key="source" ref="3575"/>
<reference key="destination" ref="356871564"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="3575"/>
<reference key="NSDestination" ref="356871564"/>
<string key="NSLabel">value: values.RPCWebDiscovery</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.RPCWebDiscovery</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1828</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">setRPCWebUIDiscovery:</string>
<reference key="source" ref="511492310"/>
<reference key="destination" ref="3575"/>
</object>
<int key="connectionID">1829</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -10160,6 +10223,7 @@ AAABAAAAAQ</bytes>
<reference ref="749999527"/>
<reference ref="52925771"/>
<reference ref="264419599"/>
<reference ref="3575"/>
</object>
<reference key="parent" ref="37013934"/>
<string key="objectName">Remote</string>
@ -11008,6 +11072,20 @@ AAABAAAAAQ</bytes>
<reference key="object" ref="810991095"/>
<reference key="parent" ref="415414007"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1825</int>
<reference key="object" ref="3575"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="105041185"/>
</object>
<reference key="parent" ref="810116101"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1826</int>
<reference key="object" ref="105041185"/>
<reference key="parent" ref="3575"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -11354,6 +11432,9 @@ AAABAAAAAQ</bytes>
<string>1823.IBPluginDependency</string>
<string>1823.ImportedFromIB2</string>
<string>1824.IBPluginDependency</string>
<string>1825.IBPluginDependency</string>
<string>1825.ImportedFromIB2</string>
<string>1826.IBPluginDependency</string>
<string>190.IBPluginDependency</string>
<string>190.ImportedFromIB2</string>
<string>192.IBPluginDependency</string>
@ -11732,7 +11813,7 @@ AAABAAAAAQ</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{179, 377}, {535, 443}}</string>
<string>{{179, 343}, {535, 477}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>{{281, 577}, {539, 315}}</string>
@ -11897,6 +11978,9 @@ AAABAAAAAQ</bytes>
<real value="1.000000e+00"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<real value="1.000000e+00"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="761722050"/>
@ -12124,7 +12208,7 @@ AAABAAAAAQ</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1824</int>
<int key="maxID">1829</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -12302,6 +12386,7 @@ AAABAAAAAQ</bytes>
<string>setRPCPort:</string>
<string>setRPCUseWhitelist:</string>
<string>setRPCUsername:</string>
<string>setRPCWebUIDiscovery:</string>
<string>setRatioStop:</string>
<string>setSound:</string>
<string>setSpeedLimit:</string>
@ -12357,6 +12442,7 @@ AAABAAAAAQ</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">