usr/lib/anon-shared-helper-scripts/te_pe_tb_check: not only check if …

…Tor bootstrap reached 100%, but also if a Tor circuit has actually been established
Kicksecure · Oct 8, 2015 · 18807e4 · 18807e4
1 parent 08c0000
commit 18807e4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/usr/lib/anon-shared-helper-scripts/te_pe_tb_check b/usr/lib/anon-shared-helper-scripts/te_pe_tb_check
@@ -129,7 +129,18 @@ $FUNCNAME: This is neither a gateway nor a workstation. Please report this bug!"
    fi
 
    if [ "$tor_bootstrap_percent" = "100" ]; then
-      ## Ok.
+      true "Ok."
+   else
+      ## Echo message, so sdwdate can integrate it into its log.
+      echo "$MSG"
+
+      ## Exit 2, so sdwdate will wait until this has been fixed.
+      exit "2"
+   fi
+
+   local MSG="Tor circuit $tor_circuit_established_word. $tor_bootstrap_percent % done. Tor reports: $tor_bootstrap_status"
+
+   if [ "$tor_circuit_established" = "1" ]; then
       ## Exit 0, so sdwdate will continue.
       exit "0"
    else