dnsx,tunnel: m refactor dns info

Author: ignoramous

intra/backend/dnsx.go

@@ -155,6 +155,7 @@ type DNSTransportMultProvider interface {
 }
 
 type DNSResolver interface {
+	DNSTransportProvider
 	DNSTransportMult
 	DNSTransportMultProvider
 	RDNSResolver

intra/dns.go

@@ -291,7 +291,27 @@ func csv2ssv(csv string) string {
 
 func fetchDNSInfo(r dnsx.Resolver, id string) string {
 	if tr, rerr := r.GetInternal(id); rerr == nil {
+		if tr.ID() != id {
+			// replace tr with the actual transport, if it is TransportMult
+			// with one or more internal/hidden away transports.
+			var mtr dnsx.TransportMult
+			var err error
+			if mtr, err = r.GetMultInternal(id); err == nil {
+				tr, err = mtr.GetInternal(id)
+			}
+			if tr == nil {
+				return id + " <x?x> " + err.Error()
+			}
+		}
+
 		var sb strings.Builder
+		tid := tr.ID()
+		if tid != id {
+			sb.WriteString(id + " <<?>> " + tr.ID())
+		} else {
+			sb.WriteString(id)
+		}
+		sb.WriteString(":")
 		sb.WriteString(tr.GetAddr())
 		sb.WriteString("[")
 		sb.WriteString(tr.Type())
@@ -308,6 +328,6 @@ func fetchDNSInfo(r dnsx.Resolver, id string) string {
 		}
 		return sb.String()
 	} else {
-		return rerr.Error()
+		return id + " <<?>> " + rerr.Error()
 	}
 }

intra/dns53/dot_test.go

@@ -123,12 +123,12 @@ var (
 	autoNsOpts = &x.DNSOpts{PIDCSV: x.RpnWin, IPCSV: "", TIDCSV: x.CT + "test0"}
 )
 
-func (*fakeBdg) OnQuery(_, _, _ string, _ int) *x.DNSOpts              { return autoNsOpts }
-func (*fakeBdg) OnUpstreamAnswer(_ *x.DNSSummary, _ string) *x.DNSOpts { return nil }
-func (*fakeBdg) OnResponse(*x.DNSSummary)                              {}
-func (*fakeBdg) OnDNSAdded(string)                                     {}
-func (*fakeBdg) OnDNSRemoved(string)                                   {}
-func (*fakeBdg) OnDNSStopped()                                         {}
+func (*fakeBdg) OnQuery(_, _, _ string, _ int) *x.DNSOpts                            { return autoNsOpts }
+func (*fakeBdg) OnUpstreamAnswer(_ *x.DNSSummary, _ *x.DNSOpts, _ string) *x.DNSOpts { return nil }
+func (*fakeBdg) OnResponse(*x.DNSSummary)                                            {}
+func (*fakeBdg) OnDNSAdded(string)                                                   {}
+func (*fakeBdg) OnDNSRemoved(string)                                                 {}
+func (*fakeBdg) OnDNSStopped()                                                       {}
 
 func (*fakeBdg) Route(a, b, c, d, e string) *x.Tab { return baseTab }
 func (*fakeBdg) OnComplete(*x.ServerSummary)       {}

intra/dnscrypt/multiserver.go

@@ -614,6 +614,11 @@ func (proxy *DcMulti) Add(t x.DNSTransport) bool {
 
 // Get implements dnsx.TransportMult
 func (proxy *DcMulti) Get(id string) (x.DNSTransport, error) {
+	return proxy.GetInternal(id)
+}
+
+// GetInternal implements dnsx.TransportMult
+func (proxy *DcMulti) GetInternal(id string) (dnsx.Transport, error) {
 	if t := proxy.serversInfo.get(id); t != nil {
 		return t, nil
 	}

intra/dnsx/plus.go

@@ -391,6 +391,11 @@ func (t *plus) Remove(id string) (y bool) {
 
 // Get implements TransportMult.
 func (t *plus) Get(id string) (x.DNSTransport, error) {
+	return t.GetInternal(id)
+}
+
+// GetInternal implements TransportMult.
+func (t *plus) GetInternal(id string) (Transport, error) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
 

intra/dnsx/transport.go

@@ -141,12 +141,13 @@ type Transport interface {
 
 // TransportMult is a hybrid: transport and a multi-transport.
 type TransportMult interface {
-	x.DNSTransportMult
+	TransportMultInternal
 	Transport
 }
 
 type TransportMultInternal interface {
 	x.DNSTransportMult
+	TransportProviderInternal
 }
 
 type TransportMultProviderInternal interface {
@@ -159,13 +160,6 @@ type TransportProviderInternal interface {
 	x.DNSTransportProvider
 	// GetInternal returns the internal transport interface for the given ID.
 	GetInternal(id string) (Transport, error)
-
-	// special purpose pre-defined transports:
-
-	// Gateway implements a DNS ALG transport
-	Gateway() Gateway
-	// MDNS returns the mdns transport, if available; error otherwise.
-	MDNS() (MDNSTransport, error)
 }
 
 type Resolver interface {
@@ -181,6 +175,13 @@ type Resolver interface {
 	// Serve reads DNS query from conn and writes DNS answer to conn
 	Serve(proto string, conn protect.Conn, uid string) (rx, tx int64, errs []error)
 
+	// special purpose pre-defined transports:
+
+	// Gateway implements a DNS ALG transport
+	Gateway() Gateway
+	// MDNS returns the mdns transport, if available; error otherwise.
+	MDNS() (MDNSTransport, error)
+
 	// StopAll stops all transports.
 	StopAll()
 
@@ -839,9 +840,10 @@ func (r *resolver) determineTransport(id string) Transport {
 	if t0 != nil && (t1 == nil || !mayusedefault || activeTransport(t0)) {
 		return t0
 	} else if t1 != nil && (!mayusedefault || activeTransport(t1)) {
+		log.W("dns: fwd: %s missing or inactive; using %s instead", id0, id1)
 		return t1
 	} else if tf != nil && mayusedefault {
-		log.W("dns: fwd: %s is missing; using default", id0)
+		log.W("dns: fwd: %s & %s missing or inactive; using default", id0, id1)
 		return tf // todo: assert tf != nil?
 	}
 

intra/tunnel.go

@@ -542,13 +542,13 @@ func (t *rtunnel) stat() (*x.NetStat, error) {
 		out.RDNSIn.DNSPreferred = fetchDNSInfo(r, x.Preferred)
 		out.RDNSIn.DNSDefault = fetchDNSInfo(r, x.Default)
 		out.RDNSIn.DNSSystem = fetchDNSInfo(r, x.System)
-		dns := make([]string, 0, 3)
+		dns := make([]string, 0, 8)
 		if csv := r.LiveTransports(); len(csv) > 0 {
 			for tr := range strings.SplitSeq(csv, ",") {
 				dns = append(dns, fetchDNSInfo(r, tr))
 			}
 		}
-		out.RDNSIn.DNS = strconv.Itoa(len(dns)) + "\n" + strings.Join(dns, ";")
+		out.RDNSIn.DNS = strconv.Itoa(len(dns)) + "\n" + strings.Join(dns, "\n")
 		out.RDNSIn.ALG = t.resolver.S()
 	}
 	if p := t.proxies; p != nil {