diff options
| author | Daniel Martà <mvdan@mvdan.cc> | 2015-03-18 13:43:48 +0100 |
|---|---|---|
| committer | Daniel Martà <mvdan@mvdan.cc> | 2015-03-18 13:44:59 +0100 |
| commit | ced244c09f46d60715d17b8e09c609e08cac87ae (patch) | |
| tree | 14110f1fbe1a6ab833857aa485fcc8bbca27a442 /obfs4proxy/obfs4proxy.go | |
| parent | 6d1b69d29985acd548895a6057aa755485785f6f (diff) | |
Reduce some if err != nil logic lines
Diffstat (limited to 'obfs4proxy/obfs4proxy.go')
| -rw-r--r-- | obfs4proxy/obfs4proxy.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index da8f011..e489b57 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -230,8 +230,7 @@ func clientHandler(f base.ClientFactory, conn *pt.SocksConn, proxyURI *url.URL) return } - err = copyLoop(conn, remote) - if err != nil { + if err = copyLoop(conn, remote); err != nil { warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) } else { infof("%s(%s) - closed connection", name, addrStr) @@ -323,8 +322,7 @@ func serverHandler(f base.ServerFactory, conn net.Conn, info *pt.ServerInfo) { } defer orConn.Close() - err = copyLoop(orConn, remote) - if err != nil { + if err = copyLoop(orConn, remote); err != nil { warnf("%s(%s) - closed connection: %s", name, addrStr, elideError(err)) } else { infof("%s(%s) - closed connection", name, addrStr) |