all: s/SetUserAgentForDoH/SetUserAgent

Author: ignoramous

intra/backend/netstat.go

@@ -154,7 +154,7 @@ type RDNSInfo struct {
 	Transparency            bool
 	PanicTest               bool
 	SystemDNSForUndelegated bool
-	SendDohUserAgent        bool
+	SetUserAgent            bool
 
 	Dialer4    bool
 	Dialer6    bool

intra/doh/doh.go

@@ -674,8 +674,8 @@ func (t *transport) asDohRequest(msg *dns.Msg) (req *http.Request, err error) {
 	}
 	req.Header.Set("content-type", dohmimetype)
 	req.Header.Set("accept", dohmimetype)
-	if settings.SetUserAgentForDoH.Load() {
-		req.Header.Set("user-agent", "Intra")
+	if settings.SetUserAgent.Load() {
+		req.Header.Set("user-agent", settings.IntraUa)
 	}
 	return
 }

intra/ipn/proxy.go

@@ -700,13 +700,9 @@ func httpsReaches(who string, c *http.Client, url *url.URL) (bool, error) {
 		return false, fmt.Errorf("proxy: reaches: err creating req: %w", err)
 	}
 
-	setua := settings.SetUserAgentForDoH.Load()
+	setua := settings.SetUserAgent.Load()
 	if setua {
-		// standard for 204 connectivity checks
-		// PROBE_HTTPS https://www.google.com/generate_204 time=183ms ret=204 request={Connection=[close], User-Agent=[Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.32 Safari/537.36]}
-		// headers={null=[HTTP/1.1 204 No Content], Alt-Svc=[h3=":443"; ma=2592000,h3-29=":443"; ma=2592000], Connection=[close], Content-Length=[0], Cross-Origin-Resource-Policy=[cross-origin],
-		// Date=[Fri, 27 Jun 2025 10:56:24 GMT], X-Android-Received-Millis=[1751021784573], X-Android-Response-Source=[NETWORK 204], X-Android-Selected-Protocol=[http/1.1], X-Android-Sent-Millis=[1751021784495]}
-		req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.32 Safari/537.36")
+		req.Header.Set("User-Agent", settings.AndroidCcUa)
 	}
 
 	resp, err := c.Do(req)

intra/settings/config.go

@@ -44,9 +44,16 @@ var EndpointIndependentFiltering = atomic.Bool{}
 // for undelegated domains.
 var SystemDNSForUndelegatedDomains = atomic.Bool{}
 
-// SetUserAgentForDoH is a global flag to set User-Agent for DoH requests
-// to "Intra".
-var SetUserAgentForDoH = atomic.Bool{}
+// SetUserAgent is a global flag to set User-Agent for DoH requests
+// to "Intra" and for HTTP "Reaches" checks to the Android default.
+var SetUserAgent = atomic.Bool{}
+
+// Android's default user-agent as set for connectivity checks
+// PROBE_HTTPS https://www.google.com/generate_204 time=183ms ret=204 request={Connection=[close], User-Agent=[Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.32 Safari/537.36]}
+// headers={null=[HTTP/1.1 204 No Content], Alt-Svc=[h3=":443"; ma=2592000,h3-29=":443"; ma=2592000], Connection=[close], Content-Length=[0], Cross-Origin-Resource-Policy=[cross-origin],
+// Date=[Fri, 27 Jun 2025 10:56:24 GMT], X-Android-Received-Millis=[1751021784573], X-Android-Response-Source=[NETWORK 204], X-Android-Selected-Protocol=[http/1.1], X-Android-Sent-Millis=[1751021784495]}
+const AndroidCcUa = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.32 Safari/537.36"
+const IntraUa = "Intra"
 
 // PanicAtRandom is a global flag to panic the network engine
 // every once in a while (for testing).

intra/tun2socks.go

@@ -143,7 +143,7 @@ func UndelegatedDomains(useSystemDNS bool) {
 func Transparency(eim, eif bool) {
 	settings.EndpointIndependentMapping.Store(eim)
 	settings.EndpointIndependentFiltering.Store(eif)
-	settings.SetUserAgentForDoH.Store(eim || eif)
+	settings.SetUserAgent.Store(eim || eif)
 	log.I("tun: eim? %t / eif? %t", eim, eif)
 }
 

intra/tunnel.go

@@ -316,7 +316,7 @@ func (t *rtunnel) stat() (*x.NetStat, error) {
 	out.RDNSIn.NewWireGuard = settings.ExperimentalWireGuard.Load()
 	out.RDNSIn.Transparency = settings.EndpointIndependentFiltering.Load()
 	out.RDNSIn.PanicTest = settings.PanicAtRandom.Load()
-	out.RDNSIn.SendDohUserAgent = settings.SetUserAgentForDoH.Load()
+	out.RDNSIn.SetUserAgent = settings.SetUserAgent.Load()
 	out.RDNSIn.SystemDNSForUndelegated = settings.SystemDNSForUndelegatedDomains.Load()
 	out.RDNSIn.Dialer4 = dialers.Use4()
 	out.RDNSIn.Dialer6 = dialers.Use6()