hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-20 00:04:24 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

Fix missing handshake success report for hijack-dns

Browse Source
This commit is contained in:
世界
2026-09-24 17:23:36 +08:00
parent 17c52d03b3
commit 83aec4222f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
route/dns.go
+12 -2
View File
@@ -20,9 +20,13 @@ import (
func (r *Router) hijackDNSStream(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
r.searchProcessInfo(ctx, &metadata)
metadata.Destination = M.Socksaddr{}
err := N.ReportConnHandshakeSuccess(conn, conn)
if err != nil {
return E.Cause(err, "report handshake success")
}
for {
conn.SetReadDeadline(time.Now().Add(C.DNSTimeout))
err := dnsOutbound.HandleStreamDNSRequest(ctx, r.dns, conn, metadata)
err = dnsOutbound.HandleStreamDNSRequest(ctx, r.dns, conn, metadata)
if err != nil {
if !E.IsClosedOrCanceled(err) {
return err
@@ -35,7 +39,13 @@ func (r *Router) hijackDNSStream(ctx context.Context, conn net.Conn, metadata ad
func (r *Router) hijackDNSPacket(ctx context.Context, conn N.PacketConn, packetBuffers []*N.PacketBuffer, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) error {
r.searchProcessInfo(ctx, &metadata)
err := dnsOutbound.NewDNSPacketConnection(ctx, r.dns, conn, packetBuffers, metadata)
err := N.ReportPacketConnHandshakeSuccess(conn, nil)
if err != nil {
N.ReleaseMultiPacketBuffer(packetBuffers)
err = E.Cause(err, "report handshake success")
} else {
err = dnsOutbound.NewDNSPacketConnection(ctx, r.dns, conn, packetBuffers, metadata)
}
N.CloseOnHandshakeFailure(conn, onClose, err)
if err != nil && !E.IsClosedOrCanceled(err) {
return E.Cause(err, "process DNS packet")