Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support accept TCP DNS request #1792

Closed
wants to merge 1 commit into from
Closed

feat: support accept TCP DNS request #1792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions dns/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ import (
)

var (
address string
server = &Server{}
address string
tcpServer = &Server{}
udpServer = &Server{}

dnsDefaultTTL uint32 = 600
)
Expand Down Expand Up @@ -51,13 +52,20 @@ func (s *Server) SetHandler(handler handler) {
func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) {
if addr == address && resolver != nil {
handler := NewHandler(resolver, mapper)
server.SetHandler(handler)
tcpServer.SetHandler(handler)
udpServer.SetHandler(handler)
return
}

if server.Server != nil {
server.Shutdown()
server = &Server{}
if tcpServer.Server != nil {
tcpServer.Shutdown()
tcpServer = &Server{}
address = ""
}

if udpServer.Server != nil {
udpServer.Shutdown()
udpServer = &Server{}
address = ""
}

Expand All @@ -77,6 +85,16 @@ func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) {
return
}

tcpAddr, err := net.ResolveTCPAddr("tcp", addr)
if err != nil {
return
}

l, err := net.ListenTCP("tcp", tcpAddr)
if err != nil {
return
}

udpAddr, err := net.ResolveUDPAddr("udp", addr)
if err != nil {
return
Expand All @@ -96,11 +114,19 @@ func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) {

address = addr
handler := NewHandler(resolver, mapper)
server = &Server{handler: handler}
server.Server = &D.Server{Addr: addr, PacketConn: p, Handler: server}

tcpServer = &Server{handler: handler}
tcpServer.Server = &D.Server{Addr: addr, Listener: l, Handler: tcpServer}

udpServer = &Server{handler: handler}
udpServer.Server = &D.Server{Addr: addr, PacketConn: p, Handler: udpServer}

go func() {
tcpServer.ActivateAndServe()
}()

go func() {
server.ActivateAndServe()
udpServer.ActivateAndServe()
}()

log.Infoln("DNS server listening at: %s", p.LocalAddr().String())
Expand Down
Loading