Replace proxy.mainProto with proxy.xTransport.mainProto everywhere

Having both was confusing and unnecessary

Author: jedisct1

dnscrypt-proxy/config.go

@@ -383,7 +383,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error {
 	// Configure server parameters
 	configureServerParams(proxy, &config)
 
-	// Configure XTransport (needs proxy.mainProto to be set)
+	// Configure XTransport (may override mainProto if proxy is configured)
 	if err := configureXTransport(proxy, &config); err != nil {
 		return err
 	}

dnscrypt-proxy/config_loader.go

@@ -66,7 +66,6 @@ func configureLogging(proxy *Proxy, flags *ConfigFlags, config *Config) {
 func configureXTransport(proxy *Proxy, config *Config) error {
 	proxy.xTransport.tlsDisableSessionTickets = config.TLSDisableSessionTickets
 	proxy.xTransport.tlsCipherSuite = config.TLSCipherSuite
-	proxy.xTransport.mainProto = proxy.mainProto
 	proxy.xTransport.http3 = config.HTTP3
 	proxy.xTransport.http3Probe = config.HTTP3Probe
 
@@ -120,7 +119,6 @@ func configureXTransport(proxy *Proxy, config *Config) error {
 			return fmt.Errorf("Unable to use the proxy: [%v]", err)
 		}
 		proxy.xTransport.proxyDialer = &proxyDialer
-		proxy.mainProto = "tcp"
 		proxy.xTransport.mainProto = "tcp"
 	}
 
@@ -174,9 +172,9 @@ func configureServerParams(proxy *Proxy, config *Config) {
 		dlog.Warnf("timeout_load_reduction must be between 0.0 and 1.0, using default 0.75")
 		proxy.timeoutLoadReduction = 0.75
 	}
-	proxy.mainProto = "udp"
+	proxy.xTransport.mainProto = "udp"
 	if config.ForceTCP {
-		proxy.mainProto = "tcp"
+		proxy.xTransport.mainProto = "tcp"
 	}
 
 	// Configure certificate refresh parameters

dnscrypt-proxy/local-doh.go

@@ -67,7 +67,7 @@ func (handler localDoHHandler) ServeHTTP(writer http.ResponseWriter, request *ht
 		writer.WriteHeader(400)
 		return
 	}
-	response := proxy.processIncomingQuery("local_doh", proxy.mainProto, packet, &xClientAddr, nil, start, false)
+	response := proxy.processIncomingQuery("local_doh", proxy.xTransport.mainProto, packet, &xClientAddr, nil, start, false)
 	if len(response) == 0 {
 		writer.WriteHeader(500)
 		return

dnscrypt-proxy/plugin_dns64.go

@@ -100,7 +100,7 @@ func (plugin *PluginDNS64) Eval(pluginsState *PluginsState, msg *dns.Msg) error
 	}
 	respPacket := plugin.proxy.processIncomingQuery(
 		"trampoline",
-		plugin.proxy.mainProto,
+		plugin.proxy.xTransport.mainProto,
 		msgAPacket,
 		nil,
 		nil,

dnscrypt-proxy/proxy.go

@@ -49,7 +49,6 @@ type Proxy struct {
 	localDoHCertKeyFile           string
 	captivePortalMapFile          string
 	localDoHPath                  string
-	mainProto                     string
 	cloakFile                     string
 	forwardFile                   string
 	blockIPFormat                 string
@@ -449,7 +448,7 @@ func (proxy *Proxy) udpListener(clientPc *net.UDPConn) {
 			dlog.Debugf("Number of goroutines: %d", runtime.NumGoroutine())
 			proxy.processIncomingQuery(
 				"udp",
-				proxy.mainProto,
+				proxy.xTransport.mainProto,
 				packet,
 				&clientAddr,
 				clientPc,
@@ -460,7 +459,7 @@ func (proxy *Proxy) udpListener(clientPc *net.UDPConn) {
 		}
 		go func() {
 			defer proxy.clientsCountDec()
-			proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, time.Now(), false)
+			proxy.processIncomingQuery("udp", proxy.xTransport.mainProto, packet, &clientAddr, clientPc, time.Now(), false)
 		}()
 	}
 }

dnscrypt-proxy/serversInfo.go

@@ -721,7 +721,7 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
 	certInfo, rtt, fragmentsBlocked, err := FetchCurrentDNSCryptCert(
 		proxy,
 		&name,
-		proxy.mainProto,
+		proxy.xTransport.mainProto,
 		stamp.ServerPk,
 		stamp.ServerAddrStr,
 		stamp.ProviderName,
@@ -757,7 +757,7 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
 		query := plainNXTestPacket(0xcafe)
 		msg, _, _, err := DNSExchange(
 			proxy,
-			proxy.mainProto,
+			proxy.xTransport.mainProto,
 			&query,
 			stamp.ServerAddrStr,
 			dnscryptRelay,