From b52b836ee134609a04c7b4b85a023b1a1456bffc Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sun, 3 Aug 2025 17:57:34 +0200 Subject: [PATCH 1/2] Revert "Add ResponseWriter.Net function (#1651)" (#1665) This reverts commit 96a6b9c19dd7b14558793fa557a62cfd3da5282d. (not backwards compatible) --- server.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/server.go b/server.go index 2b4630f38..364149cfc 100644 --- a/server.go +++ b/server.go @@ -44,8 +44,6 @@ type ResponseWriter interface { LocalAddr() net.Addr // RemoteAddr returns the net.Addr of the client that sent the current request. RemoteAddr() net.Addr - // Network returns the value of the Net field of the Server (e.g., "tcp", "tcp-tls"). - Network() string // WriteMsg writes a reply back to the client. WriteMsg(*Msg) error // Write writes a raw buffer back to the client. @@ -79,7 +77,6 @@ type response struct { udpSession *SessionUDP // oob data to get egress interface right pcSession net.Addr // address to use when writing to a generic net.PacketConn writer Writer // writer to output the raw DNS bits - network string // corresponding Server.Net value } // handleRefused returns a HandlerFunc that returns REFUSED for every request it gets. @@ -560,7 +557,7 @@ func (srv *Server) serveUDP(l net.PacketConn) error { // Serve a new TCP connection. func (srv *Server) serveTCPConn(wg *sync.WaitGroup, rw net.Conn) { - w := &response{tsigProvider: srv.tsigProvider(), tcp: rw, network: srv.Net} + w := &response{tsigProvider: srv.tsigProvider(), tcp: rw} if srv.DecorateWriter != nil { w.writer = srv.DecorateWriter(w) } else { @@ -615,7 +612,7 @@ func (srv *Server) serveTCPConn(wg *sync.WaitGroup, rw net.Conn) { // Serve a new UDP request. func (srv *Server) serveUDPPacket(wg *sync.WaitGroup, m []byte, u net.PacketConn, udpSession *SessionUDP, pcSession net.Addr) { - w := &response{tsigProvider: srv.tsigProvider(), udp: u, udpSession: udpSession, pcSession: pcSession, network: srv.Net} + w := &response{tsigProvider: srv.tsigProvider(), udp: u, udpSession: udpSession, pcSession: pcSession} if srv.DecorateWriter != nil { w.writer = srv.DecorateWriter(w) } else { @@ -821,9 +818,6 @@ func (w *response) RemoteAddr() net.Addr { } } -// Network implements the ResponseWriter.Network method. -func (w *response) Network() string { return w.network } - // TsigStatus implements the ResponseWriter.TsigStatus method. func (w *response) TsigStatus() error { return w.tsigStatus } From 54c180dc19ce2b2cf1500b51f3c640d1c25272d7 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sun, 3 Aug 2025 17:58:10 +0200 Subject: [PATCH 2/2] Release 1.1.68 --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 4d402489f..4af7d286c 100644 --- a/version.go +++ b/version.go @@ -3,7 +3,7 @@ package dns import "fmt" // Version is current version of this library. -var Version = v{1, 1, 67} +var Version = v{1, 1, 68} // v holds the version of this library. type v struct {