Do not activate the AAAA blocking plugin automatically

2015-07-27 23:42:58 +02:00
parent 976e85bc26
commit a9d852b76d
4 changed files with 14 additions and 16 deletions
@@ -26,6 +26,7 @@ DEBUG_ENABLED_FILE="${CONTROL_DIR}/debug.enabled"
 PLUGINS_ENABLED_FILE="${CONTROL_DIR}/plugins.enabled"
 QUERY_LOGGING_FILE="${CONTROL_DIR}/plugin-query-logging.enabled"
 BLOCKING_FILE="${CONTROL_DIR}/plugin-blocking.enabled"
+AAAA_BLOCKING_FILE="${CONTROL_DIR}/plugin-aaaa-blocking.enabled"

 QUERY_LOG_FILE="${DNSCRYPT_LOG_BASE_DIR}/dnscrypt-query.log"
 DEBUG_LOG_FILE="${DNSCRYPT_LOG_BASE_DIR}/dnscrypt-osxclient-debug.log"
@@ -59,8 +60,6 @@ DOMAINS_EXCEPTIONS='
 belkin corp domain example home host invalid lan local localdomain test freebox.fr fritz.box nowtv.com routerlogin.net l
 '

-DISABLE_IPV6='no'
-
 export PATH="${DNSCRYPT_USR_BASE_DIR}/bin:${DNSCRYPT_USR_BASE_DIR}/scripts:$PATH"

 init_interfaces() {
@@ -74,18 +74,6 @@ get_plugin_args() {
 logger_debug "dnscrypt-proxy should be (re)started, stopping previous instance if needed"
 ./stop-dnscrypt-proxy.sh

-ipv6_supported="no"
-if [ x"$DISABLE_IPV6" = "xno" ]; then
-  logger_debug "Testing IPv6 connectivity"
-  ping6 -c 1 2620:0:ccc::2 > /dev/null 2>&1
-  if [ $? = 0 ]; then
-    ipv6_supported="yes"
-    logger_debug "IPv6 connectivity detected"
-  else
-    logger_debug "IPv6 connectivity is not available"  
-  fi
-fi
-
 wait_pids=""

 try_resolver 5004 "${RESOLVER_NAME} using DNSCrypt over UDP" \
@@ -111,8 +99,6 @@ plugins_args=''
 if [ -r "${DNSCRYPT_PROXY_PLUGINS_BASE_FILE}s.enabled" ]; then
  plugin_args=$(get_plugin_args)
 fi
-[ "$ipv6_supported" = "no" ] && \
-  plugin_args="${plugin_args} --plugin=libdcplugin_example_ldns_aaaa_blocking.la"

 best_args=$(cat "${RES_DIR}/${best_file}")

@@ -0,0 +1,6 @@
+#! /bin/sh
+
+. ./common.inc
+
+rm -f "$AAAA_BLOCKING_FILE"
+
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+. ./common.inc
+
+echo "libdcplugin_example_ldns_aaaa_blocking.la" > "$AAAA_BLOCKING_FILE"
+
+touch "$PLUGINS_ENABLED_FILE"