This commit is contained in:
Frank Denis
2012-07-31 19:47:27 -07:00
parent 92ba5b55d7
commit 033993c9d7
4 changed files with 7 additions and 8 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ if [ -e "$DNSCRYPT_FILE" ]; then
./switch-to-dnscrypt-if-required.sh
else
./stop-dnscrypt-proxy.sh
./switch-to-dhcp-if-required-.sh
./switch-to-dhcp-if-required.sh
fi
rm -f "${STATES_DIR}/updating"
rm -f "${STATES_DIR}/update-request"
+1 -1
View File
@@ -3,4 +3,4 @@
. ./common.inc
rm -f "$DNSCRYPT_FILE"
exec ./switch-to-dhcp-if-required.sh
-1
View File
@@ -3,4 +3,3 @@
. ./common.inc
touch "$DNSCRYPT_FILE"
exec ./switch-to-dnscrypt-if-required.sh
@@ -116,7 +116,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
}
[self updateLedStatus];
NSString *currentResolvers = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh", nil]];
NSString *currentResolvers = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-upstream-resolvers.sh", nil]];
_statusConfigurationMenuItem.title = stateDescription;
_statusResolversMenuItem.title = currentResolvers;
@@ -164,14 +164,14 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
}
- (BOOL) setDNSCryptOn {
NSString *fileName = [NSString stringWithFormat: kDNSCRYPT_CONTROL_DIR @"/dnscrypt"];
[@"on" writeToFile: fileName atomically: NO encoding: NSUTF8StringEncoding error: nil];
NSString *res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./switch-to-dnscrypt.sh", nil]];
NSLog(@"%@", res);
return TRUE;
}
- (BOOL) setDNSCryptOff {
NSString *fileName = [NSString stringWithFormat: kDNSCRYPT_CONTROL_DIR @"/dnscrypt"];
[[NSFileManager defaultManager] removeItemAtPath: fileName error: nil];
NSString *res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./switch-to-dhcp.sh", nil]];
NSLog(@"%@", res);
return TRUE;
}