Port to Mavericks

This commit is contained in:
Alter Step
2014-04-18 00:19:18 -07:00
parent 830396921d
commit 09df20a910
12 changed files with 512 additions and 2442 deletions
@@ -37,6 +37,9 @@ INTERFACE_PROXY_MASK="24"
INTERFACE_PROBES="127.0.0.55"
INTERFACE_PROBES_MASK="24"
PROVIDER_NAME='2.dnscrypt-cert.opendns.com'
PROVIDER_KEY='B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79'
DOMAINS_EXCEPTIONS='
freebox.fr fritz.box intranet lan localdomain nowtv.com private routerlogin.net l
'
@@ -32,6 +32,7 @@ try_resolver() {
rm -f "${RES_DIR}/${priority}"
exec alarmer 3 dnscrypt-proxy --pid="$pid_file" \
--provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \
--local-address="${INTERFACE_PROBES}:${priority}" $args 2>&1 | \
while read line; do
case "$line" in
@@ -135,6 +136,7 @@ fi
best_args=$(cat "${RES_DIR}/${best_file}")
eval dnscrypt-proxy $best_args --local-address="$INTERFACE_PROXY" \
--provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \
--pidfile="$PROXY_PID_FILE" --user=daemon --daemonize $plugin_args
if [ $? != 0 ]; then
@@ -146,6 +148,7 @@ if [ $? != 0 ]; then
killall -9 dnscrypt-proxy
sleep 1
eval dnscrypt-proxy $best_args --local-address="$INTERFACE_PROXY" \
--provider-name="$PROVIDER_NAME" --provider-key="$PROVIDER_KEY" \
--pidfile="$PROXY_PID_FILE" --user=daemon --daemonize $plugin_args || \
exit 1
fi