From 884363bd0535f4582b9f4425f671c7d7e4c82955 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 1 Nov 2016 19:01:28 -0500
Subject: [PATCH 1/4] remove ipv6 check since it's already in setupVars

---
 advanced/Scripts/chronometer.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index 2c305d53..7ed20417 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -61,14 +61,6 @@ CalcPercentBlockedToday() {
 	fi
 }
 
-CheckIPv6() {
-	piholeIPv6file="/etc/pihole/.useIPv6"
-	if [[ -f ${piholeIPv6file} ]];then
-		# If the file exists, then the user previously chose to use IPv6 in the automated installer
-		piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
-	fi
-}
-
 outputJSON() {
 	CalcQueriesToday
 	CalcblockedToday

From f8e97269223dc06b58aef15f2c25a6ff3fbd8504 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 1 Nov 2016 19:01:48 -0500
Subject: [PATCH 2/4] source setupVars and check for the correct variable

---
 advanced/Scripts/chronometer.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index 7ed20417..bd755453 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -17,11 +17,12 @@ gravity="/etc/pihole/gravity.list"
 
 today=$(date "+%b %e")
 
+. /etc/pihole/setupVars.conf
+
 CalcBlockedDomains() {
-	CheckIPv6
 	if [ -e "${gravity}" ]; then
 		#Are we IPV6 or IPV4?
-		if [[ -n ${piholeIPv6} ]]; then
+		if [[ -n "${IPv6_address}" ]]; then
 			#We are IPV6
 			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1/2}')
 		else

From d7d6d6f99107f355a9da8827d8a4de3be50fa271 Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Wed, 2 Nov 2016 21:46:30 +0000
Subject: [PATCH 3/4] Update to use new Var name

---
 advanced/Scripts/chronometer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index bd755453..16ff6fb6 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -22,7 +22,7 @@ today=$(date "+%b %e")
 CalcBlockedDomains() {
 	if [ -e "${gravity}" ]; then
 		#Are we IPV6 or IPV4?
-		if [[ -n "${IPv6_address}" ]]; then
+		if [[ -n "${IPV6_ADDRESS}" ]]; then
 			#We are IPV6
 			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1/2}')
 		else

From 43007592873b31538e1ed816c83d8b3dd8b1792a Mon Sep 17 00:00:00 2001
From: Adam Warner <awarner@croydon.parkeon.com>
Date: Thu, 3 Nov 2016 08:01:25 +0000
Subject: [PATCH 4/4] Fix logic. If both v6 and v4 divide by two, else dont.

---
 advanced/Scripts/chronometer.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index 16ff6fb6..2e6cabda 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -21,12 +21,11 @@ today=$(date "+%b %e")
 
 CalcBlockedDomains() {
 	if [ -e "${gravity}" ]; then
-		#Are we IPV6 or IPV4?
-		if [[ -n "${IPV6_ADDRESS}" ]]; then
-			#We are IPV6
+		# if BOTH IPV4 and IPV6 are in use, then we need to divide total domains by 2.
+		if [[ -n "${IPV4_ADDRESS}" && -n "${IPV6_ADDRESS}" ]]; then
 			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1/2}')
 		else
-			#We are IPV4
+			# only one is set.
 			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1}')
 		fi
 	else
@@ -104,8 +103,6 @@ normalChrono() {
 		CalcBlockedDomains
 
 		echo "Blocking:      ${blockedDomainsTotal}"
-		#below commented line does not add up to todaysQueryCount
-		#echo "Queries:       $todaysQueryCountV4 / $todaysQueryCountV6"
 		echo "Queries:       ${queriesToday}" #same total calculation as dashboard
 	  echo "Pi-holed:      ${blockedToday} (${percentBlockedToday}%)"