mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-27 08:14:18 -04:00 
			
		
		
		
	Replace manual host:port parsing using net.SplitHostPort + strconv.ParseUint with the standard library net/netip function ParseAddrPort. This eliminates integer conversion warnings and improves type safety. Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>
		
			
				
	
	
		
			70 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package forward
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"net"
 | |
| 	"net/netip"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/coredns/coredns/plugin/dnstap/msg"
 | |
| 	"github.com/coredns/coredns/plugin/pkg/proxy"
 | |
| 	"github.com/coredns/coredns/request"
 | |
| 
 | |
| 	tap "github.com/dnstap/golang-dnstap"
 | |
| 	"github.com/miekg/dns"
 | |
| )
 | |
| 
 | |
| // toDnstap will send the forward and received message to the dnstap plugin.
 | |
| func toDnstap(ctx context.Context, f *Forward, host string, state request.Request, opts proxy.Options, reply *dns.Msg, start time.Time) {
 | |
| 	ap, _ := netip.ParseAddrPort(host) // this is preparsed and can't err here
 | |
| 	ip := net.IP(ap.Addr().AsSlice())
 | |
| 	port := int(ap.Port())
 | |
| 
 | |
| 	var ta net.Addr = &net.UDPAddr{
 | |
| 		IP:   ip,
 | |
| 		Port: port,
 | |
| 	}
 | |
| 	t := state.Proto()
 | |
| 	switch {
 | |
| 	case opts.ForceTCP:
 | |
| 		t = "tcp"
 | |
| 	case opts.PreferUDP:
 | |
| 		t = "udp"
 | |
| 	}
 | |
| 
 | |
| 	if t == "tcp" {
 | |
| 		ta = &net.TCPAddr{IP: ip, Port: port}
 | |
| 	}
 | |
| 
 | |
| 	for _, t := range f.tapPlugins {
 | |
| 		// Query
 | |
| 		q := new(tap.Message)
 | |
| 		msg.SetQueryTime(q, start)
 | |
| 		// Forwarder dnstap messages are from the perspective of the downstream server
 | |
| 		// (upstream is the forward server)
 | |
| 		msg.SetQueryAddress(q, state.W.RemoteAddr())
 | |
| 		msg.SetResponseAddress(q, ta)
 | |
| 		if t.IncludeRawMessage {
 | |
| 			buf, _ := state.Req.Pack()
 | |
| 			q.QueryMessage = buf
 | |
| 		}
 | |
| 		msg.SetType(q, tap.Message_FORWARDER_QUERY)
 | |
| 		t.TapMessageWithMetadata(ctx, q, state)
 | |
| 
 | |
| 		// Response
 | |
| 		if reply != nil {
 | |
| 			r := new(tap.Message)
 | |
| 			if t.IncludeRawMessage {
 | |
| 				buf, _ := reply.Pack()
 | |
| 				r.ResponseMessage = buf
 | |
| 			}
 | |
| 			msg.SetQueryTime(r, start)
 | |
| 			msg.SetQueryAddress(r, state.W.RemoteAddr())
 | |
| 			msg.SetResponseAddress(r, ta)
 | |
| 			msg.SetResponseTime(r, time.Now())
 | |
| 			msg.SetType(r, tap.Message_FORWARDER_RESPONSE)
 | |
| 			t.TapMessageWithMetadata(ctx, r, state)
 | |
| 		}
 | |
| 	}
 | |
| }
 |