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

Refactor SOCKS-related logging.

Browse source
This commit is contained in:
David Fifield 2019-12-24 19:02:01 -07:00
parent aa3999857f
commit febb4936f6
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/snowflake.go
View file

@ -47,9 +47,7 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) {
// Accept local SOCKS connections and pass them to the handler. // Accept local SOCKS connections and pass them to the handler.
func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) {
defer ln.Close() defer ln.Close()
log.Println("Started SOCKS listener.")
for { for {
log.Println("SOCKS listening...")
conn, err := ln.AcceptSocks() conn, err := ln.AcceptSocks()
if err != nil { if err != nil {
if err, ok := err.(net.Error); ok && err.Temporary() { if err, ok := err.(net.Error); ok && err.Temporary() {
@ -58,7 +56,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) {
log.Printf("SOCKS accept error: %s", err) log.Printf("SOCKS accept error: %s", err)
break break
} }
log.Println("SOCKS accepted: ", conn.Req) log.Printf("SOCKS accepted: %v", conn.Req)
err = sf.Handler(conn, snowflakes) err = sf.Handler(conn, snowflakes)
if err != nil { if err != nil {
log.Printf("handler error: %s", err) log.Printf("handler error: %s", err)
@ -167,6 +165,7 @@ func main() {
pt.CmethodError(methodName, err.Error()) pt.CmethodError(methodName, err.Error())
break break
} }
log.Printf("Started SOCKS listener at %v.", ln.Addr())
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)