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

Remove erroneous logging around pt.*Error calls.

Browse source 
These functions are called for their side effect of sending a PT error
message on stdout; they also return a representation of the error
message as an error object for the caller to use if it wishes. These
functions *always* return a non-nil error object; it is not something to
be logged, any more than the return value of errors.New is.

The mistaken logging was added in
https://bugs.torproject.org/31794
b26c7a7a73
3ec9dd19fa
ed3d42e1ec
This commit is contained in:
David Fifield 2020-01-20 23:57:31 -07:00
parent 37aaaffa15
commit 5ff75e1034
3 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/snowflake.go
View file

@ -157,9 +157,7 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
if ptInfo.ProxyURL != nil { if ptInfo.ProxyURL != nil {
if err := pt.ProxyError("proxy is not supported"); err != nil { pt.ProxyError("proxy is not supported")
log.Printf("call to pt.ProxyError generated error: %v", err)
}
os.Exit(1) os.Exit(1)
} }
listeners := make([]net.Listener, 0) listeners := make([]net.Listener, 0)
@ -169,18 +167,14 @@ func main() {
// TODO: Be able to recover when SOCKS dies. // TODO: Be able to recover when SOCKS dies.
ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") ln, err := pt.ListenSocks("tcp", "127.0.0.1:0")
if err != nil { if err != nil {
if inerr := pt.CmethodError(methodName, err.Error()); inerr != nil { pt.CmethodError(methodName, err.Error())
log.Printf("handling error generated by pt.ListenSocks with pt.CmethodError generated error: %v", inerr)
}
break break
} }
go socksAcceptLoop(ln, snowflakes) go socksAcceptLoop(ln, snowflakes)
pt.Cmethod(methodName, ln.Version(), ln.Addr()) pt.Cmethod(methodName, ln.Version(), ln.Addr())
listeners = append(listeners, ln) listeners = append(listeners, ln)
default: default:
if err := pt.CmethodError(methodName, "no such method"); err != nil { pt.CmethodError(methodName, "no such method")
log.Printf("calling pt.CmethodError generated error: %v", err)
}
} }
} }
pt.CmethodsDone() pt.CmethodsDone()

4
server-webrtc/snowflake.go
View file

@ -230,9 +230,7 @@ func main() {
bindaddr.Addr.Port = 12345 // lies!!! bindaddr.Addr.Port = 12345 // lies!!!
pt.Smethod(bindaddr.MethodName, bindaddr.Addr) pt.Smethod(bindaddr.MethodName, bindaddr.Addr)
default: default:
if err := pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { pt.SmethodError(bindaddr.MethodName, "no such method")
log.Printf("SmethodError returned error: %v", err)
}
} }
} }
pt.SmethodsDone() pt.SmethodsDone()

12
server/server.go
View file

@ -282,9 +282,7 @@ func main() {
servers := make([]*http.Server, 0) servers := make([]*http.Server, 0)
for _, bindaddr := range ptInfo.Bindaddrs { for _, bindaddr := range ptInfo.Bindaddrs {
if bindaddr.MethodName != ptMethodName { if bindaddr.MethodName != ptMethodName {
if err = pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { pt.SmethodError(bindaddr.MethodName, "no such method")
log.Printf("pt.SmethodError returned error: %v", err)
}
continue continue
} }
@ -296,9 +294,7 @@ func main() {
lnHTTP01, err = net.ListenTCP("tcp", &addr) lnHTTP01, err = net.ListenTCP("tcp", &addr)
if err != nil { if err != nil {
log.Printf("error opening HTTP-01 ACME listener: %s", err) log.Printf("error opening HTTP-01 ACME listener: %s", err)
if inerr := pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()); inerr != nil { pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error())
log.Printf("pt.SmethodError returned error: %v", inerr)
}
continue continue
} }
server := &http.Server{ server := &http.Server{
@ -326,9 +322,7 @@ func main() {
} }
if err != nil { if err != nil {
log.Printf("error opening listener: %s", err) log.Printf("error opening listener: %s", err)
if inerr := pt.SmethodError(bindaddr.MethodName, err.Error()); inerr != nil { pt.SmethodError(bindaddr.MethodName, err.Error())
log.Printf("pt.SmethodError returned error: %v", inerr)
}
continue continue
} }
pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args) pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args)