From 89e8c923fa531aaefe032ff7960d8064c7965166 Mon Sep 17 00:00:00 2001
From: Alter Step <alterstep@localhost>
Date: Mon, 28 Apr 2014 18:53:28 -0700
Subject: [PATCH] lockfile -l acts weird - Do not use it. Add some logging for
 the HTTP hijack test

---
 .../DNSCrypt/extra/usr/scripts/common.inc                 | 2 +-
 .../DNSCrypt/extra/usr/scripts/handle-control-change.sh   | 2 +-
 .../DNSCrypt/extra/usr/scripts/handle-network-change.sh   | 2 +-
 .../extra/usr/scripts/switch-to-dnscrypt-if-required.sh   | 8 +++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
index d33fe50..3d60c84 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
@@ -62,7 +62,7 @@ logger_debug() {
   [ -f "$DEBUG_ENABLED_FILE" ] || return
   local msg="$1"
   local now="$(date)"
-  lockfile "$DEBUG_LOG_FILE_LOCK" -1 -r 1 -l 5
+  lockfile -1 -r 1 "$DEBUG_LOG_FILE_LOCK"
   echo "$now - $msg" >> "$DEBUG_LOG_FILE"
   rm -f "$DEBUG_LOG_FILE_LOCK"
 }
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-control-change.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-control-change.sh
index 45222ea..c76ea61 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-control-change.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-control-change.sh
@@ -5,7 +5,7 @@
 PROCESSED_TICKETS_FILE="${STATES_DIR}/processed-tickets"
 
 update() {
-  lockfile -1 -r 30 -l 60 "$HANDLERS_LOCK_FILE" || exit 1
+  lockfile -1 -r 30 "$HANDLERS_LOCK_FILE" || exit 1
 
   if [ -e "$DNSCRYPT_FILE" ]; then
     ./switch-to-dnscrypt-if-required.sh
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
index 40e8471..14790c1 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
@@ -13,7 +13,7 @@ fi
 logger_debug "Network configuration changed"
 
 
-lockfile -1 -r 30 -l 60 "$HANDLERS_LOCK_FILE" || exit 1
+lockfile -1 -r 30 "$HANDLERS_LOCK_FILE" || exit 1
 ./set-dns-to-dhcp.sh
 if [ ! -e "$DNSCRYPT_FILE" ]; then
   rm -f "$HANDLERS_LOCK_FILE"
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
index f6824a2..5238d7b 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
@@ -23,7 +23,13 @@ while [ -e "$DNSCRYPT_FILE" ]; do
     pause=$((pause + $PAUSE_INCREMENT))
   fi
   sleep $pause
-  ./check-hijacking.sh || continue
+  logger_debug "Checking if the router hijacks HTTP queries"
+  if ./check-hijacking.sh; then
+    logger_debug "The router doesn't hijack HTTP queries"
+  else
+    logger_debug "The router hijacks HTTP queries - DNSCrypt is likely to be blocked"
+    continue
+  fi
   ./start-dnscrypt-proxy.sh || continue
   ./check-local-dns.sh || continue
   ./set-dns.sh "$INTERFACE_PROXY"