mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-14 05:11:19 -04:00
Suppress connection end log output
This is an amendment of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/30
This commit is contained in:
parent
b35a79ac24
commit
50646698e3
2 changed files with 5 additions and 3 deletions
|
@ -38,6 +38,7 @@ package snowflake_server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
|
@ -262,7 +263,7 @@ func (l *SnowflakeListener) acceptSessions(ln *kcp.Listener) error {
|
||||||
go func() {
|
go func() {
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
err := l.acceptStreams(conn)
|
err := l.acceptStreams(conn)
|
||||||
if err != nil && err != io.ErrClosedPipe {
|
if err != nil && !errors.Is(err, io.ErrClosedPipe) {
|
||||||
log.Printf("acceptStreams: %v", err)
|
log.Printf("acceptStreams: %v", err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
@ -47,7 +48,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
|
||||||
wg.Add(2)
|
wg.Add(2)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if _, err := io.Copy(conn, local); err != nil && err != io.ErrClosedPipe {
|
if _, err := io.Copy(conn, local); err != nil && !errors.Is(err, io.ErrClosedPipe) {
|
||||||
log.Printf("error copying ORPort to WebSocket %v", err)
|
log.Printf("error copying ORPort to WebSocket %v", err)
|
||||||
}
|
}
|
||||||
local.CloseRead()
|
local.CloseRead()
|
||||||
|
@ -55,7 +56,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
go func() {
|
go func() {
|
||||||
if _, err := io.Copy(local, conn); err != nil && err != io.ErrClosedPipe {
|
if _, err := io.Copy(local, conn); err != nil && !errors.Is(err, io.ErrClosedPipe) {
|
||||||
log.Printf("error copying WebSocket to ORPort %v", err)
|
log.Printf("error copying WebSocket to ORPort %v", err)
|
||||||
}
|
}
|
||||||
local.CloseWrite()
|
local.CloseWrite()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue