From 511767f848842fe71bd2b637ae9c4ef22c96b25f Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 29 Jul 2012 22:40:31 -0700 Subject: [PATCH] Control fallback and other stuff from files --- CU2/check-network-change.sh | 4 ++-- CU2/common.inc | 1 + CU2/handle-network-change.sh | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CU2/check-network-change.sh b/CU2/check-network-change.sh index 767ad52..f71011f 100755 --- a/CU2/check-network-change.sh +++ b/CU2/check-network-change.sh @@ -1,12 +1,12 @@ #! /bin/ksh # /Library/Preferences/SystemConfiguration +. common.inc + NETWORK_STATE_FILE="${STATES_DIR}/network-state" DHCP_DNS_FILE="${STATES_DIR}/dhcp-dns" AIRPORT_TOOL="/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Resources/airport" -. common.inc - mkdir -p "$STATES_DIR" || exit 1 ifs=$(ifconfig -a | \ diff --git a/CU2/common.inc b/CU2/common.inc index f58fb07..294af32 100644 --- a/CU2/common.inc +++ b/CU2/common.inc @@ -2,6 +2,7 @@ DNSCRYPT_BASE_DIR='/var/run/dnscrypt' STATES_DIR="${DNSCRYPT_BASE_DIR}/states" +CONTROL_DIR="${DNSCRYPT_BASE_DIR}/control" INTERFACE_UNBOUND="127.0.0.53" INTERFACE_UNBOUND_MASK="24" diff --git a/CU2/handle-network-change.sh b/CU2/handle-network-change.sh index be0a639..ab7f113 100755 --- a/CU2/handle-network-change.sh +++ b/CU2/handle-network-change.sh @@ -1,10 +1,12 @@ #! /bin/ksh -PAUSE_MAX=10 -PAUSE_INCREMENT=0.1 - . common.inc +PAUSE_MAX=10 +PAUSE_INCREMENT=0.1 +FALLBACK_FILE="${CONTROL_DIR}/fallback" + +[ ! -e "$FALLBACK_FILE" ] && exit 0 ./check-network-change.sh || exit 0 ./check-hijacking.sh && exit 0 ./set-dns-to-dhcp.sh