SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-06 05:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cast 4in6 from reading socksaddr

Browse source
This commit is contained in:
世界 2022-05-27 07:24:02 +08:00
parent 5b49366f6e
commit 01ea424838
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/buf/buffer.go
View file

@ -94,7 +94,7 @@ func (b *Buffer) Write(data []byte) (n int, err error) {
return 0, io.ErrShortBuffer return 0, io.ErrShortBuffer
} }
if b.end+len(data) > b.Cap() { if b.end+len(data) > b.Cap() {
panic("buffer overflow") panic("buffer overflow: cap " + strconv.Itoa(len(b.data)) + ",end " + strconv.Itoa(b.end) + ", need " + strconv.Itoa(len(data)))
} }
n = copy(b.data[b.end:], data) n = copy(b.data[b.end:], data)
b.end += n b.end += n

6
common/metadata/serializer.go
View file

@ -122,7 +122,11 @@ func (s *Serializer) ReadAddress(reader io.Reader) (Socksaddr, error) {
if err != nil { if err != nil {
return Socksaddr{}, E.Cause(err, "read ipv6 address") return Socksaddr{}, E.Cause(err, "read ipv6 address")
} }
return Socksaddr{Addr: netip.AddrFrom16(addr)}, nil netAddr := netip.AddrFrom16(addr)
if netAddr.Is4In6() {
netAddr = netip.AddrFrom4(netAddr.As4())
}
return Socksaddr{Addr: netAddr}, nil
default: default:
return Socksaddr{}, E.New("unknown address family: ", af) return Socksaddr{}, E.New("unknown address family: ", af)
} }