From 6154d4173a85b706a13cf49eb922c0fc427b8147 Mon Sep 17 00:00:00 2001 From: Iskander Sharipov Date: Thu, 13 Sep 2018 21:04:07 +0300 Subject: [PATCH] remove some commented-out (dead) code There are much more places, removed only few of them to make review simpler (we can remove more later). Found using https://go-critic.github.io/overview#commentedOutCode-ref --- core/cs/server/server.go | 1 - services/mux/mux_bridge.go | 1 - services/sps/sps.go | 2 -- 3 files changed, 4 deletions(-) diff --git a/core/cs/server/server.go b/core/cs/server/server.go index ff623f6..2a3a25d 100644 --- a/core/cs/server/server.go +++ b/core/cs/server/server.go @@ -230,7 +230,6 @@ func (s *ServerChannel) ListenKCP(config kcpcfg.KCPConfigArgs, fn func(conn net. } }() for { - //var conn net.Conn conn, err := lis.AcceptKCP() if err == nil { go func() { diff --git a/services/mux/mux_bridge.go b/services/mux/mux_bridge.go index c589e66..4027fc5 100644 --- a/services/mux/mux_bridge.go +++ b/services/mux/mux_bridge.go @@ -216,7 +216,6 @@ func (s *MuxBridge) handler(inConn net.Conn) { v.(*smux.Session).Close() } group.Set(index, session) - // s.clientControlConns.Set(key, session) go func() { defer func() { if e := recover(); e != nil { diff --git a/services/sps/sps.go b/services/sps/sps.go index da1bad9..da5ef35 100644 --- a/services/sps/sps.go +++ b/services/sps/sps.go @@ -363,7 +363,6 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (lbAddr string, err error) { request.HTTPSReply() //s.log.Printf("https reply: %s", request.Host) } else { - //forwardBytes = bytes.TrimRight(request.HeadBuf,"\r\n") forwardBytes = request.HeadBuf } address = request.Host @@ -412,7 +411,6 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (lbAddr string, err error) { selectAddr = address } lbAddr = s.lb.Select(selectAddr, *s.cfg.LoadBalanceOnlyHA) - //lbAddr = s.lb.Select((*inConn).RemoteAddr().String()) outConn, err = s.GetParentConn(lbAddr) if err != nil { s.log.Printf("connect to %s , err:%s", lbAddr, err)