From 97d3031a2e379002cebbbba909a64fddb7bf33fb Mon Sep 17 00:00:00 2001
From: fangdingjun <fangdingjun@gmail.com>
Date: Thu, 5 Jan 2017 10:39:42 +0800
Subject: [PATCH] go vet

---
 conn.go   | 1 -
 server.go | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/conn.go b/conn.go
index a280613..d406472 100644
--- a/conn.go
+++ b/conn.go
@@ -70,7 +70,6 @@ func NewObfsConn(c net.Conn, method, key string, isServer bool) (*ObfsConn, erro
 					return nil, err
 				}
 			}
-			return nil, err
 		}
 	} else {
 		if err := wc.writeSeed(); err != nil {
diff --git a/server.go b/server.go
index cd9f760..4c20212 100644
--- a/server.go
+++ b/server.go
@@ -244,7 +244,7 @@ func (sc *Server) handleCancelTcpipForward(req *ssh.Request) {
 func (sc *Server) handleTcpipForward(req *ssh.Request) {
 	var addr tcpipForwardAddr
 	if err := ssh.Unmarshal(req.Payload, &addr); err != nil {
-		Log(ERROR, "parse ssh data error: %s", err.Error)
+		Log(ERROR, "parse ssh data error: %s", err)
 		if req.WantReply {
 			req.Reply(false, nil)
 		}