Alawn/dnscrypt-osxclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Almost done

Browse Source
This commit is contained in:
Frank Denis
2012-07-31 23:09:25 -07:00
parent 366d077bfb
commit 480bd8fbb9
3 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m
+1
View File
@@ -139,6 +139,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
currentState = kDNS_CONFIGURATION_UNKNOWN;
} else if ([stateDescription isEqualToString: @"Updating"]) {
currentState = kDNS_CONFIGURATION_UNKNOWN;
return FALSE;
} else if (stateDescription.length > 0) {
currentState = kDNS_CONFIGURATION_VANILLA;
}
DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
+34 -31
View File
@@ -144,20 +144,18 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
- (IBAction)opendnsButtonPressed:(NSButton *)sender
{
if (sender.state != 0) {
[self setFamilyShieldOn];
[self setInsecureOpenDNSOn];
} else {
sender.state = 0;
[self setFamilyShieldOff];
[self setInsecureOpenDNSOn];
}
}
- (IBAction)familyShieldButtonPressed:(NSButton *)sender
{
if (sender.state != 0) {
[self setInsecureOpenDNSOn];
[self setFamilyShieldOn];
} else {
sender.state = 0;
[self setInsecureOpenDNSOff];
[self setFamilyShieldOff];
}
}
@@ -166,7 +164,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
if (sender.state != 0) {
[self setFallbackOn];
} else {
sender.state = 0;
[self setFallbackOff];
}
}
@@ -191,30 +188,8 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
_fallbackButton.state = NSOnState;
}
- (BOOL) updateStatusWithCurrentConfig
- (void) updateLedStatus
{
DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
NSError *err;
NSString *resolvConf = [NSString stringWithContentsOfFile: @"/etc/resolv.conf" encoding: NSISOLatin1StringEncoding error: &err];
if (resolvConf) {
NSMutableArray *resolvers = [[[NSMutableArray alloc] init] autorelease];
NSMutableString *resolversString = [[[NSMutableString alloc] init] autorelease];
NSArray *lines = [resolvConf componentsSeparatedByString: @"\n"];
for (NSString *line in lines) {
line = [line stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
NSArray *entry = [line componentsSeparatedByCharactersInSet: [NSCharacterSet whitespaceCharacterSet]];
if (![[entry objectAtIndex: 0U] isEqualToString: @"nameserver"]) {
continue;
}
NSString *resolver = [entry objectAtIndex: 1U];
[resolvers addObject: resolver];
[resolversString appendFormat: @"%s%@", (resolversString.length > 0 ? "\n" : ""), resolver];
}
currentState = kDNS_CONFIGURATION_VANILLA;
_currentResolverTextField.stringValue = resolversString;
}
NSBundle *bundle = [NSBundle bundleWithIdentifier: @"com.opendns.osx.DNSCrypt"];
switch (currentState) {
case kDNS_CONFIGURATION_UNKNOWN:
@@ -234,8 +209,36 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
_statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"shield_green.png"]] autorelease];
break;
default:
return FALSE;
return;
}
}
- (BOOL) updateStatusWithCurrentConfig
{
currentState = kDNS_CONFIGURATION_UNKNOWN;
NSString *stateDescription = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-resolvers-description.sh", nil]];
NSLog(@"%@", stateDescription);
if ([stateDescription isEqualToString: @"FamilyShield"]) {
currentState = kDNS_CONFIGURATION_OPENDNS;
} else if ([stateDescription isEqualToString: @"DNSCrypt"]) {
currentState = kDNS_CONFIGURATION_LOCALHOST;
} else if ([stateDescription isEqualToString: @"OpenDNS"]) {
currentState = kDNS_CONFIGURATION_OPENDNS;
} else if ([stateDescription isEqualToString: @"OpenDNS IPv6"]) {
currentState = kDNS_CONFIGURATION_OPENDNS;
} else if ([stateDescription isEqualToString: @"None"]) {
currentState = kDNS_CONFIGURATION_UNKNOWN;
} else if ([stateDescription isEqualToString: @"Updating"]) {
currentState = kDNS_CONFIGURATION_UNKNOWN;
return FALSE;
} else if (stateDescription.length > 0) {
currentState = kDNS_CONFIGURATION_VANILLA;
}
[self updateLedStatus];
NSString *currentResolvers = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-upstream-resolvers.sh", nil]];
_currentResolverTextField.stringValue = currentResolvers;
return TRUE;
}
DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
+10 -24
View File
@@ -65,6 +65,7 @@
<string key="NSFrame">{{13, 10}, {563, 359}}</string>
<reference key="NSSuperview" ref="1037298196"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1025762247"/>
<string key="NSReuseIdentifierKey">_NS:461</string>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="19707695">
@@ -79,7 +80,7 @@
<string key="NSFrame">{{15, 238}, {204, 22}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="891532389"/>
<reference key="NSNextKeyView" ref="300098131"/>
<string key="NSReuseIdentifierKey">_NS:239</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="743617070">
@@ -95,7 +96,7 @@
<reference key="NSControlView" ref="894789954"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="220837555">
<object class="NSCustomResource" key="NSNormalImage" id="338365942">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
@@ -115,7 +116,7 @@
<string key="NSFrame">{{15, 212}, {245, 24}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="894789954"/>
<reference key="NSNextKeyView" ref="891532389"/>
<string key="NSReuseIdentifierKey">_NS:239</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="555340075">
@@ -127,7 +128,7 @@
<reference key="NSControlView" ref="300098131"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="220837555"/>
<reference key="NSNormalImage" ref="338365942"/>
<reference key="NSAlternateImage" ref="875688652"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -158,7 +159,7 @@
<reference key="NSControlView" ref="410495287"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="220837555"/>
<reference key="NSNormalImage" ref="338365942"/>
<reference key="NSAlternateImage" ref="875688652"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -173,6 +174,7 @@
<string key="NSFrame">{{15, 133}, {204, 22}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="240318099"/>
<string key="NSReuseIdentifierKey">_NS:239</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="805275804">
@@ -184,7 +186,7 @@
<reference key="NSControlView" ref="384170040"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="220837555"/>
<reference key="NSNormalImage" ref="338365942"/>
<reference key="NSAlternateImage" ref="875688652"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -262,7 +264,7 @@
<object class="NSTextField" id="496861916">
<reference key="NSNextResponder" ref="1025762247"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{26, 2}, {240, 78}}</string>
<string key="NSFrame">{{14, -3}, {240, 83}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="855319081"/>
@@ -295,7 +297,7 @@
<string key="NSFrame">{{115, 283}, {125, 19}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="300098131"/>
<reference key="NSNextKeyView" ref="894789954"/>
<string key="NSReuseIdentifierKey">_NS:3596</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="118313349">
@@ -424,7 +426,6 @@
<string key="NSFrame">{{323, 190}, {183, 32}}</string>
<reference key="NSSuperview" ref="1025762247"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="821865429"/>
<string key="NSReuseIdentifierKey">_NS:2419</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="675161177">
@@ -1247,9 +1248,6 @@
<string key="familyShieldButtonPressed:">NSButton</string>
<string key="openDNSLinkPushed:">NSButton</string>
<string key="opendnsButtonPressed:">NSButton</string>
<string key="xenableDNSCryptButtonPressed:">NSButton</string>
<string key="xenableInsecureDNSButtonPressed:">NSButton</string>
<string key="xenableOpenDNSButtonPressed:">NSButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="dnscryptButtonPressed:">
@@ -1272,18 +1270,6 @@
<string key="name">opendnsButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="xenableDNSCryptButtonPressed:">
<string key="name">xenableDNSCryptButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="xenableInsecureDNSButtonPressed:">
<string key="name">xenableInsecureDNSButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBActionInfo" key="xenableOpenDNSButtonPressed:">
<string key="name">xenableOpenDNSButtonPressed:</string>
<string key="candidateClassName">NSButton</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="aboutWebView">WebView</string>