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

Fix WriteAddrPort usage

Browse source
This commit is contained in:
世界 2023-09-07 08:56:10 +08:00
parent a446ff2f57
commit 126234728c
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shadowaead/protocol.go
View file

@ -232,7 +232,10 @@ func (c *clientPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksad
defer buffer.Release() defer buffer.Release()
header := buf.With(buffer.ExtendHeader(c.keySaltLength + M.SocksaddrSerializer.AddrPortLen(destination))) header := buf.With(buffer.ExtendHeader(c.keySaltLength + M.SocksaddrSerializer.AddrPortLen(destination)))
header.WriteRandom(c.keySaltLength) header.WriteRandom(c.keySaltLength)
common.Must(M.SocksaddrSerializer.WriteAddrPort(header, destination)) err := M.SocksaddrSerializer.WriteAddrPort(header, destination)
if err != nil {
return err
}
key := buf.NewSize(c.keySaltLength) key := buf.NewSize(c.keySaltLength)
Kdf(c.key, buffer.To(c.keySaltLength), key) Kdf(c.key, buffer.To(c.keySaltLength), key)
writeCipher, err := c.constructor(key.Bytes()) writeCipher, err := c.constructor(key.Bytes())

5
shadowaead_2022/protocol.go
View file

@ -297,7 +297,10 @@ func (c *clientConn) writeRequest(payload []byte) error {
writer.WriteChunk(header, fixedLengthBuffer.Slice()) writer.WriteChunk(header, fixedLengthBuffer.Slice())
variableLengthBuffer := buf.NewSize(variableLengthHeaderLen) variableLengthBuffer := buf.NewSize(variableLengthHeaderLen)
common.Must(M.SocksaddrSerializer.WriteAddrPort(variableLengthBuffer, c.destination)) err = M.SocksaddrSerializer.WriteAddrPort(variableLengthBuffer, c.destination)
if err != nil {
return err
}
common.Must(binary.Write(variableLengthBuffer, binary.BigEndian, uint16(paddingLen))) common.Must(binary.Write(variableLengthBuffer, binary.BigEndian, uint16(paddingLen)))
if paddingLen > 0 { if paddingLen > 0 {
variableLengthBuffer.Extend(paddingLen) variableLengthBuffer.Extend(paddingLen)