chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve DNS truncate behavior

Browse Source
This commit is contained in:
世界 2024-02-14 20:42:58 +08:00
parent 19f5a36e7e
commit 73373aeb3f
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
outbound/dns.go
View File

@ -111,9 +111,7 @@ func (d *DNS) NewPacketConnection(ctx context.Context, conn N.PacketConn, metada
} }
} }
if readWaiter, created := bufio.CreatePacketReadWaiter(reader); created { if readWaiter, created := bufio.CreatePacketReadWaiter(reader); created {
readWaiter.InitializeReadWaiter(N.ReadWaitOptions{ readWaiter.InitializeReadWaiter(N.ReadWaitOptions{})
MTU: dns.FixedPacketSize,
})
return d.newPacketConnection(ctx, conn, readWaiter, counters, cachedPackets, metadata) return d.newPacketConnection(ctx, conn, readWaiter, counters, cachedPackets, metadata)
} }
break break
@ -241,16 +239,11 @@ func (d *DNS) newPacketConnection(ctx context.Context, conn N.PacketConn, readWa
return err return err
} }
timeout.Update() timeout.Update()
response = truncateDNSMessage(response, 512) // TODO: add an option to custom UDP buffer size responseBuffer, err := dns.TruncateDNSMessage(&message, response, 1024)
responseBuffer := buf.NewSize(dns.FixedPacketSize)
responseBuffer.Resize(1024, 0)
n, err := response.PackBuffer(responseBuffer.FreeBytes())
if err != nil { if err != nil {
cancel(err) cancel(err)
responseBuffer.Release()
return err return err
} }
responseBuffer.Truncate(len(n))
err = conn.WritePacket(responseBuffer, destination) err = conn.WritePacket(responseBuffer, destination)
if err != nil { if err != nil {
cancel(err) cancel(err)
@ -264,22 +257,3 @@ func (d *DNS) newPacketConnection(ctx context.Context, conn N.PacketConn, readWa
}) })
return group.Run(fastClose) return group.Run(fastClose)
} }
func truncateDNSMessage(response *mDNS.Msg, maxLen int) *mDNS.Msg {
responseLen := response.Len()
if responseLen <= maxLen {
return response
}
newResponse := *response
response = &newResponse
for len(response.Answer) > 0 && responseLen > maxLen {
response.Answer = response.Answer[:len(response.Answer)-1]
response.Truncated = true
responseLen = response.Len()
}
if responseLen > maxLen {
response.Ns = nil
response.Extra = nil
}
return response
}