From ced244c09f46d60715d17b8e09c609e08cac87ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 18 Mar 2015 13:43:48 +0100 Subject: Reduce some if err != nil logic lines --- obfs4proxy/obfs4proxy.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'obfs4proxy/obfs4proxy.go') 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) -- cgit v1.2.3