From 48990da22ea7b0c60d75e912bd6e9ba5b006449a Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 31 Jan 2019 16:49:23 +0800 Subject: [PATCH 1/2] go vet --- client/proxy/proxy.go | 24 ++++++++++++------------ client/visitor.go | 8 ++++---- models/config/server_common.go | 2 +- models/proto/udp/udp.go | 1 - server/proxy/http.go | 2 +- server/proxy/https.go | 2 +- server/proxy/proxy.go | 12 ++++++------ server/proxy/stcp.go | 2 +- server/proxy/tcp.go | 2 +- server/proxy/udp.go | 2 +- server/proxy/xtcp.go | 2 +- 11 files changed, 29 insertions(+), 30 deletions(-) diff --git a/client/proxy/proxy.go b/client/proxy/proxy.go index 610a6f8..4b721aa 100644 --- a/client/proxy/proxy.go +++ b/client/proxy/proxy.go @@ -53,32 +53,32 @@ func NewProxy(pxyConf config.ProxyConf) (pxy Proxy) { switch cfg := pxyConf.(type) { case *config.TcpProxyConf: pxy = &TcpProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } case *config.UdpProxyConf: pxy = &UdpProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } case *config.HttpProxyConf: pxy = &HttpProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } case *config.HttpsProxyConf: pxy = &HttpsProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } case *config.StcpProxyConf: pxy = &StcpProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } case *config.XtcpProxyConf: pxy = &XtcpProxy{ - BaseProxy: baseProxy, + BaseProxy: &baseProxy, cfg: cfg, } } @@ -93,7 +93,7 @@ type BaseProxy struct { // TCP type TcpProxy struct { - BaseProxy + *BaseProxy cfg *config.TcpProxyConf proxyPlugin plugin.Plugin @@ -122,7 +122,7 @@ func (pxy *TcpProxy) InWorkConn(conn frpNet.Conn) { // HTTP type HttpProxy struct { - BaseProxy + *BaseProxy cfg *config.HttpProxyConf proxyPlugin plugin.Plugin @@ -151,7 +151,7 @@ func (pxy *HttpProxy) InWorkConn(conn frpNet.Conn) { // HTTPS type HttpsProxy struct { - BaseProxy + *BaseProxy cfg *config.HttpsProxyConf proxyPlugin plugin.Plugin @@ -180,7 +180,7 @@ func (pxy *HttpsProxy) InWorkConn(conn frpNet.Conn) { // STCP type StcpProxy struct { - BaseProxy + *BaseProxy cfg *config.StcpProxyConf proxyPlugin plugin.Plugin @@ -209,7 +209,7 @@ func (pxy *StcpProxy) InWorkConn(conn frpNet.Conn) { // XTCP type XtcpProxy struct { - BaseProxy + *BaseProxy cfg *config.XtcpProxyConf proxyPlugin plugin.Plugin @@ -308,7 +308,7 @@ func (pxy *XtcpProxy) InWorkConn(conn frpNet.Conn) { // UDP type UdpProxy struct { - BaseProxy + *BaseProxy cfg *config.UdpProxyConf diff --git a/client/visitor.go b/client/visitor.go index 6634401..1e8ffec 100644 --- a/client/visitor.go +++ b/client/visitor.go @@ -52,12 +52,12 @@ func NewVisitor(ctl *Control, cfg config.VisitorConf) (visitor Visitor) { switch cfg := cfg.(type) { case *config.StcpVisitorConf: visitor = &StcpVisitor{ - BaseVisitor: baseVisitor, + BaseVisitor: &baseVisitor, cfg: cfg, } case *config.XtcpVisitorConf: visitor = &XtcpVisitor{ - BaseVisitor: baseVisitor, + BaseVisitor: &baseVisitor, cfg: cfg, } } @@ -73,7 +73,7 @@ type BaseVisitor struct { } type StcpVisitor struct { - BaseVisitor + *BaseVisitor cfg *config.StcpVisitorConf } @@ -160,7 +160,7 @@ func (sv *StcpVisitor) handleConn(userConn frpNet.Conn) { } type XtcpVisitor struct { - BaseVisitor + *BaseVisitor cfg *config.XtcpVisitorConf } diff --git a/models/config/server_common.go b/models/config/server_common.go index 9587f8a..d468376 100644 --- a/models/config/server_common.go +++ b/models/config/server_common.go @@ -51,7 +51,7 @@ type ServerCommonConf struct { VhostHttpPort int `json:"vhost_http_port"` // if VhostHttpsPort equals 0, don't listen a public port for https protocol - VhostHttpsPort int `json:"vhost_http_port"` + VhostHttpsPort int `json:"vhost_https_port"` VhostHttpTimeout int64 `json:"vhost_http_timeout"` diff --git a/models/proto/udp/udp.go b/models/proto/udp/udp.go index 1ea5a9b..2677634 100644 --- a/models/proto/udp/udp.go +++ b/models/proto/udp/udp.go @@ -67,7 +67,6 @@ func ForwardUserConn(udpConn *net.UDPConn, readCh <-chan *msg.UdpPacket, sendCh default: } } - return } func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UdpPacket, sendCh chan<- msg.Message) { diff --git a/server/proxy/http.go b/server/proxy/http.go index 7c1b62b..b76fe67 100644 --- a/server/proxy/http.go +++ b/server/proxy/http.go @@ -29,7 +29,7 @@ import ( ) type HttpProxy struct { - BaseProxy + *BaseProxy cfg *config.HttpProxyConf closeFuncs []func() diff --git a/server/proxy/https.go b/server/proxy/https.go index 354a99e..a35af23 100644 --- a/server/proxy/https.go +++ b/server/proxy/https.go @@ -24,7 +24,7 @@ import ( ) type HttpsProxy struct { - BaseProxy + *BaseProxy cfg *config.HttpsProxyConf } diff --git a/server/proxy/proxy.go b/server/proxy/proxy.go index 7bdc081..c07453a 100644 --- a/server/proxy/proxy.go +++ b/server/proxy/proxy.go @@ -135,33 +135,33 @@ func NewProxy(runId string, rc *controller.ResourceController, statsCollector st case *config.TcpProxyConf: basePxy.usedPortsNum = 1 pxy = &TcpProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } case *config.HttpProxyConf: pxy = &HttpProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } case *config.HttpsProxyConf: pxy = &HttpsProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } case *config.UdpProxyConf: basePxy.usedPortsNum = 1 pxy = &UdpProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } case *config.StcpProxyConf: pxy = &StcpProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } case *config.XtcpProxyConf: pxy = &XtcpProxy{ - BaseProxy: basePxy, + BaseProxy: &basePxy, cfg: cfg, } default: diff --git a/server/proxy/stcp.go b/server/proxy/stcp.go index 13c6732..8cd43b2 100644 --- a/server/proxy/stcp.go +++ b/server/proxy/stcp.go @@ -19,7 +19,7 @@ import ( ) type StcpProxy struct { - BaseProxy + *BaseProxy cfg *config.StcpProxyConf } diff --git a/server/proxy/tcp.go b/server/proxy/tcp.go index aae44dc..e00e3a0 100644 --- a/server/proxy/tcp.go +++ b/server/proxy/tcp.go @@ -23,7 +23,7 @@ import ( ) type TcpProxy struct { - BaseProxy + *BaseProxy cfg *config.TcpProxyConf realPort int diff --git a/server/proxy/udp.go b/server/proxy/udp.go index 554b410..104bff8 100644 --- a/server/proxy/udp.go +++ b/server/proxy/udp.go @@ -30,7 +30,7 @@ import ( ) type UdpProxy struct { - BaseProxy + *BaseProxy cfg *config.UdpProxyConf realPort int diff --git a/server/proxy/xtcp.go b/server/proxy/xtcp.go index 6cef4d6..9c5f911 100644 --- a/server/proxy/xtcp.go +++ b/server/proxy/xtcp.go @@ -24,7 +24,7 @@ import ( ) type XtcpProxy struct { - BaseProxy + *BaseProxy cfg *config.XtcpProxyConf closeCh chan struct{} From bbab3fe9cab1d8023841f209bd03bc41e1850979 Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 31 Jan 2019 16:54:46 +0800 Subject: [PATCH 2/2] go lint --- utils/log/log.go | 5 ++++- utils/net/websocket.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/log/log.go b/utils/log/log.go index a0e42b8..c0ce7f1 100644 --- a/utils/log/log.go +++ b/utils/log/log.go @@ -20,6 +20,7 @@ import ( "github.com/fatedier/beego/logs" ) +// Log is the under log object var Log *logs.BeeLogger func init() { @@ -33,6 +34,7 @@ func InitLog(logWay string, logFile string, logLevel string, maxdays int64) { SetLogLevel(logLevel) } +// SetLogFile to configure log params // logWay: file or console func SetLogFile(logWay string, logFile string, maxdays int64) { if logWay == "console" { @@ -43,6 +45,7 @@ func SetLogFile(logWay string, logFile string, maxdays int64) { } } +// SetLogLevel set log level, default is warning // value: error, warning, info, debug, trace func SetLogLevel(logLevel string) { level := 4 // warning @@ -85,7 +88,7 @@ func Trace(format string, v ...interface{}) { Log.Trace(format, v...) } -// Logger +// Logger is the log interface type Logger interface { AddLogPrefix(string) GetPrefixStr() string diff --git a/utils/net/websocket.go b/utils/net/websocket.go index 8ecc17e..9942337 100644 --- a/utils/net/websocket.go +++ b/utils/net/websocket.go @@ -31,6 +31,7 @@ type WebsocketListener struct { httpMutex *http.ServeMux } +// NewWebsocketListener to handle websocket connections // ln: tcp listener for websocket connections func NewWebsocketListener(ln net.Listener) (wl *WebsocketListener) { wl = &WebsocketListener{