dnsx,doh: m debug logs

Author: ignoramous

intra/dnsx/alg.go

@@ -669,14 +669,14 @@ func (t *dnsgateway) fromInternalCache(tid, uid string, q *dns.Msg, typ iptype)
 		cachedips = cached6s
 	}
 
-	ttl := uint32(until.Seconds())
-	log.VV("alg: response for %s by %s[%s] (v4? %t / v6? %t) realip; in cache? %v [until: %d] (or stale? %v)",
-		domain, tid, uid, a, aaaa, cachedips, ttl, stale)
+	ttl := int64(until / time.Second)
+	log.VV("alg: response for %s by %s[%s] (v4? %t / v6? %t) realip; in cache? %v [until: %s] (or stale? %v)",
+		domain, tid, uid, a, aaaa, cachedips, core.FmtSecs(ttl), stale)
 
 	if len(cachedips) <= 0 {
 		return nil, errNilCacheResponse
 	}
-	return xdns.AQuadAForQueryTTL(q, ttl, cachedips...)
+	return xdns.AQuadAForQueryTTL(q, uint32(ttl), cachedips...)
 }
 
 func (t *dnsgateway) qp(t1 Transport, uid, network string, q *dns.Msg, innersummary *x.DNSSummary) (ans *dns.Msg, err error) {

intra/doh/doh.go

@@ -753,8 +753,8 @@ func (t *transport) Query(network string, q *dns.Msg, smm *x.DNSSummary) (r *dns
 	if err != nil {
 		smm.Msg = err.Error()
 	}
-	log.V("doh: (p/px/via %s/%s/%s); a:%d/sz:%d/pad:%d, q: %s, data: %s, via: %s, err? %v",
-		network, pid, rpid, xdns.Len(r), xdns.Size(r), xdns.EDNS0PadLen(r), smm.QName, smm.RData, smm.PID, err)
+	log.V("doh: (p/px/via %s/%s/%s); a:%d/sz:%d/pad:%d, q: %s:%s, data: %s, via: %s, err? %v",
+		network, pid, rpid, xdns.Len(r), xdns.Size(r), xdns.EDNS0PadLen(r), smm.QName, smm.QType, smm.RData, smm.PID, err)
 	return r, err
 }