xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tun/with-tun' into Alpha

Browse source
This commit is contained in:
Meta 2022-03-25 14:20:05 +08:00
commit 24583009c4
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
listener/tun/ipstack/commons/dns.go
View file

@ -27,15 +27,9 @@ func RelayDnsPacket(payload []byte) ([]byte, error) {
r, err := resolver.ServeMsg(msg) r, err := resolver.ServeMsg(msg)
if err != nil { if err != nil {
return nil, err m := new(D.Msg)
} m.SetRcode(msg, D.RcodeServerFailure)
return m.Pack()
for _, ans := range r.Answer {
header := ans.Header()
if header.Class == D.ClassINET && (header.Rrtype == D.TypeA || header.Rrtype == D.TypeAAAA) {
header.Ttl = 1
}
} }
r.SetRcode(msg, r.Rcode) r.SetRcode(msg, r.Rcode)

4
listener/tun/ipstack/system/mars/nat/udp.go
View file

@ -74,8 +74,8 @@ func (u *UDP) WriteTo(buf []byte, local net.Addr, remote net.Addr) (int, error)
srcIP, _ := netip.AddrFromSlice(srcAddr.IP) srcIP, _ := netip.AddrFromSlice(srcAddr.IP)
dstIp, _ := netip.AddrFromSlice(dstAddr.IP) dstIp, _ := netip.AddrFromSlice(dstAddr.IP)
srcAddrPort := netip.AddrPortFrom(srcIP, uint16(srcAddr.Port)) srcAddrPort := netip.AddrPortFrom(srcIP.Unmap(), uint16(srcAddr.Port))
dstAddrPort := netip.AddrPortFrom(dstIp, uint16(dstAddr.Port)) dstAddrPort := netip.AddrPortFrom(dstIp.Unmap(), uint16(dstAddr.Port))
if !srcAddrPort.Addr().Is4() || !dstAddrPort.Addr().Is4() { if !srcAddrPort.Addr().Is4() || !dstAddrPort.Addr().Is4() {
return 0, net.InvalidAddrError("invalid ip version") return 0, net.InvalidAddrError("invalid ip version")

2
listener/tun/ipstack/system/stack.go
View file

@ -176,7 +176,7 @@ func New(device device.Device, dnsHijack []netip.AddrPort, tunAddress netip.Pref
local: lAddr, local: lAddr,
data: raw, data: raw,
writeBack: func(b []byte, addr net.Addr) (int, error) { writeBack: func(b []byte, addr net.Addr) (int, error) {
return stack.UDP().WriteTo(b, addr, lAddr) return stack.UDP().WriteTo(b, rAddr, lAddr)
}, },
drop: func() { drop: func() {
pool.Put(buf) pool.Put(buf)