kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ineffectual assignments

This commit is contained in:
Andy Wang 2020-04-04 16:10:43 +01:00
parent 35236b27d1
commit 5e1931a11c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ck-client/ck-client.go
View File

@ -138,7 +138,7 @@ start:
stream.Close() stream.Close()
break break
} }
i, err = localConn.WriteToUDP(buf[:i], otherEnd.Load().(*net.UDPAddr)) _, err = localConn.WriteToUDP(buf[:i], otherEnd.Load().(*net.UDPAddr))
if err != nil { if err != nil {
log.Print(err) log.Print(err)
localConn.Close() localConn.Close()
@ -164,7 +164,7 @@ start:
break break
} }
otherEnd.Store(oe) otherEnd.Store(oe)
i, err = stream.Write(buf[:i]) _, err = stream.Write(buf[:i])
if err != nil { if err != nil {
localConn.Close() localConn.Close()
stream.Close() stream.Close()

2
internal/multiplex/session_test.go
View File

@ -172,7 +172,7 @@ func TestRecvDataFromRemote_Closing_InOrder(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("receiving normal frame for stream 1: %v", err) t.Fatalf("receiving normal frame for stream 1: %v", err)
} }
s1I, ok := sesh.streams.Load(f1.StreamID) _, ok := sesh.streams.Load(f1.StreamID)
if !ok { if !ok {
t.Fatal("failed to fetch stream 1 after receiving it") t.Fatal("failed to fetch stream 1 after receiving it")
} }

6
internal/util/util.go
View File

@ -68,7 +68,7 @@ func ReadTLS(conn net.Conn, buffer []byte) (n int, err error) {
// a single message can also be segmented due to MTU of the IP layer. // a single message can also be segmented due to MTU of the IP layer.
// This function guareentees a single TLS message to be read and everything // This function guareentees a single TLS message to be read and everything
// else is left in the buffer. // else is left in the buffer.
i, err := io.ReadFull(conn, buffer[:5]) _, err = io.ReadFull(conn, buffer[:5])
if err != nil { if err != nil {
return return
} }
@ -87,7 +87,7 @@ func ReadTLS(conn net.Conn, buffer []byte) (n int, err error) {
// if left < buffer size (i.e. multiple messages came together), // if left < buffer size (i.e. multiple messages came together),
// only the message we want is read // only the message we want is read
i, err = conn.Read(buffer[readPtr : readPtr+left]) i, err := conn.Read(buffer[readPtr : readPtr+left])
if err != nil { if err != nil {
return return
} }
@ -129,7 +129,7 @@ func Pipe(dst net.Conn, src net.Conn, srcReadTimeout time.Duration) {
src.Close() src.Close()
return return
} }
i, err = dst.Write(buf[:i]) _, err = dst.Write(buf[:i])
if err != nil { if err != nil {
dst.Close() dst.Close()
src.Close() src.Close()