archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'encapsulation-readdata-buffer'

Browse source
This commit is contained in:
David Fifield 2023-11-21 03:46:46 +00:00
commit aa06e7bef3
4 changed files with 132 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/lib/turbotunnel.go
View file

@ -37,11 +37,11 @@ func newEncapsulationPacketConn(
// ReadFrom reads an encapsulated packet from the stream.
func (c *encapsulationPacketConn) ReadFrom(p []byte) (int, net.Addr, error) {
data, err := encapsulation.ReadData(c.ReadWriteCloser)
if err != nil {
return 0, c.remoteAddr, err
n, err := encapsulation.ReadData(c.ReadWriteCloser, p)
if err == io.ErrShortBuffer {
err = nil
}
return copy(p, data), c.remoteAddr, nil
return n, c.remoteAddr, err
}
// WriteTo writes an encapsulated packet to the stream.