dnsx: assign block-target where approp

Author: ignoramous

intra/dnsx/alg.go

@@ -1011,10 +1011,11 @@ func (t *dnsgateway) querySecondary(t2 Transport, uid, network string, msg *dns.
 		log.V("alg: querySecondary: skip; sec transport %s; nores? %t, err? %v", idstr(t2), r == nil, err)
 		result.smm.Msg = errNotEnoughAnswers.Error()
 		return
-	} else if a, blocklistnames := t.rdns.blockA( /*may be nil*/ t2, nil, msg, r, result.smm.Blocklists); a != nil {
+	} else if a, blockedtarget, blocklistnames := t.rdns.blockA( /*may be nil*/ t2, nil, msg, r, result.smm.Blocklists); a != nil {
 		// if "a" is not nil, then the r is blocked
 		if len(blocklistnames) > 0 {
 			result.smm.Blocklists = blocklistnames
+			result.smm.BlockedTarget = blockedtarget
 		}
 		// when rdns.blockA blocks, A/AAAA must be 0.0.0.0/::
 		// and HTTPS/SVCB is an empty answer section
@@ -1028,6 +1029,7 @@ func (t *dnsgateway) querySecondary(t2 Transport, uid, network string, msg *dns.
 	} else {
 		if len(blocklistnames) > 0 {
 			result.smm.Blocklists = blocklistnames
+			result.smm.BlockedTarget = blockedtarget
 		}
 		if xdns.AQuadAUnspecified(r) {
 			// A/AAAA must be 0.0.0.0/::, set UpstreamBlocks to true
@@ -1200,6 +1202,7 @@ func (t *dnsgateway) q(t1, t2 Transport, preset []netip.Addr, network, uid strin
 
 	// inform kt of secondary blocklists, if any
 	smm.Blocklists = secres.smm.Blocklists
+	smm.BlockedTarget = secres.smm.BlockedTarget
 	smm.UpstreamBlocks = secres.smm.UpstreamBlocks || smm.UpstreamBlocks
 
 	if smm.UpstreamBlocks || len(secres.smm.Msg) > 0 {
@@ -2261,9 +2264,10 @@ func withPresetSummary(smm *x.DNSSummary, reqSent, fixed bool) {
 		smm.Server = "127.5.3.9"
 	}
 	smm.Server = PrefixFor(id) + smm.Server
-	smm.Blocklists = "" // blocklists are not honoured
-	smm.PID = ""        // no relay is used
-	smm.RPID = ""       // no hops either
+	smm.Blocklists = ""    // blocklists are not honoured
+	smm.BlockedTarget = "" // no targets are blocked
+	smm.PID = ""           // no relay is used
+	smm.RPID = ""          // no hops either
 }
 
 func idstr(t Transport) string {

intra/dnsx/cacher.go

@@ -608,6 +608,7 @@ func fillSummary(s *x.DNSSummary, out *x.DNSSummary) {
 	out.RTtl = s.RTtl
 	out.Status = s.Status
 	out.Blocklists = s.Blocklists
+	out.BlockedTarget = s.BlockedTarget
 	out.Msg = s.Msg
 	out.UpstreamBlocks = s.UpstreamBlocks
 }

intra/dnsx/rethinkdns.go

@@ -84,7 +84,7 @@ type RDNS interface {
 	x.RDNS
 	OnDeviceBlock() bool // Mode
 	blockQuery(*dns.Msg) (string, error)
-	blockAnswer(*dns.Msg) (string, error)
+	blockAnswer(*dns.Msg) (string, string, error)
 }
 
 type rethinkdns struct {
@@ -297,8 +297,8 @@ func (r *rethinkdns) keyToNames(list []string) (v []string) {
 	return
 }
 
-func (r *rethinkdns) blockQuery(*dns.Msg) (b string, err error)  { err = errRemote; return }
-func (r *rethinkdns) blockAnswer(*dns.Msg) (b string, err error) { err = errRemote; return }
+func (r *rethinkdns) blockQuery(*dns.Msg) (b string, err error)     { err = errRemote; return }
+func (r *rethinkdns) blockAnswer(*dns.Msg) (t, b string, err error) { err = errRemote; return }
 
 func (r *rethinkdnslocal) blockQuery(msg *dns.Msg) (blocklists string, err error) {
 	if len(msg.Question) <= 0 {

intra/dnsx/wall.go

@@ -175,7 +175,7 @@ func (r *resolver) blockA(t, t2 Transport, q, ans *dns.Msg, blocklistStamp strin
 		if settings.Debug {
 			log.V("wall: no local blockerA; letting through %s", qname)
 		}
-		return nil, ""
+		return
 	}
 
 	if !b.OnDeviceBlock() {

intra/doh/doh.go

@@ -816,6 +816,7 @@ func (t *transport) Query(network string, q *dns.Msg, smm *x.DNSSummary) (r *dns
 	smm.RTtl = xdns.RTtl(r)
 	smm.Status = status
 	smm.Region = region
+	// TODO: smm.BlockedTarget
 	smm.Blocklists = blocklists
 	if t.typ == dnsx.ODOH && len(t.odohproxyname) > 0 {
 		smm.PID = t.odohproxyname // odoh proxy