cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gocritic linter warnings

Browse Source
This commit is contained in:
Dzyanis Kuzmenka 2022-03-17 22:54:04 +03:00
parent 7abbf5188d
commit 70fb6d396d
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/proxy/proxy_manager.go
View File

@ -113,11 +113,9 @@ func (pm *Manager) Reload(pxyCfgs map[string]config.ProxyConf) {
cfg, ok := pxyCfgs[name] cfg, ok := pxyCfgs[name]
if !ok { if !ok {
del = true del = true
} else { } else if !pxy.Cfg.Compare(cfg) {
if !pxy.Cfg.Compare(cfg) {
del = true del = true
} }
}
if del { if del {
delPxyNames = append(delPxyNames, name) delPxyNames = append(delPxyNames, name)

2
client/service.go
View File

@ -181,7 +181,7 @@ func (svr *Service) keepControllerWorking() {
xl.Warn("reconnect to server error: %v, wait %v for another retry", err, delayTime) xl.Warn("reconnect to server error: %v, wait %v for another retry", err, delayTime)
util.RandomSleep(delayTime, 0.9, 1.1) util.RandomSleep(delayTime, 0.9, 1.1)
delayTime = delayTime * 2 delayTime *= 2
if delayTime > maxDelayTime { if delayTime > maxDelayTime {
delayTime = maxDelayTime delayTime = maxDelayTime
} }

4
client/visitor_manager.go
View File

@ -99,11 +99,9 @@ func (vm *VisitorManager) Reload(cfgs map[string]config.VisitorConf) {
cfg, ok := cfgs[name] cfg, ok := cfgs[name]
if !ok { if !ok {
del = true del = true
} else { } else if !oldCfg.Compare(cfg) {
if !oldCfg.Compare(cfg) {
del = true del = true
} }
}
if del { if del {
delNames = append(delNames, name) delNames = append(delNames, name)

7
pkg/util/net/tls.go
View File

@ -41,13 +41,16 @@ func CheckAndEnableTLSServerConnWithTimeout(
return return
} }
if n == 1 && int(buf[0]) == FRPTLSHeadByte { if n == 1 {
switch int(buf[0]) {
case FRPTLSHeadByte:
out = tls.Server(c, tlsConfig) out = tls.Server(c, tlsConfig)
isTLS = true isTLS = true
custom = true custom = true
} else if n == 1 && int(buf[0]) == 0x16 { case 0x16:
out = tls.Server(sc, tlsConfig) out = tls.Server(sc, tlsConfig)
isTLS = true isTLS = true
}
} else { } else {
if tlsOnly { if tlsOnly {
err = fmt.Errorf("non-TLS connection received on a TlsOnly server") err = fmt.Errorf("non-TLS connection received on a TlsOnly server")

9
pkg/util/util/util.go
View File

@ -44,7 +44,7 @@ func RandIDWithLen(idLen int) (id string, err error) {
} }
func GetAuthKey(token string, timestamp int64) (key string) { func GetAuthKey(token string, timestamp int64) (key string) {
token = token + fmt.Sprintf("%d", timestamp) token += fmt.Sprintf("%d", timestamp)
md5Ctx := md5.New() md5Ctx := md5.New()
md5Ctx.Write([]byte(token)) md5Ctx.Write([]byte(token))
data := md5Ctx.Sum(nil) data := md5Ctx.Sum(nil)
@ -70,7 +70,8 @@ func ParseRangeNumbers(rangeStr string) (numbers []int64, err error) {
numArray := strings.Split(numRangeStr, "-") numArray := strings.Split(numRangeStr, "-")
// length: only 1 or 2 is correct // length: only 1 or 2 is correct
rangeType := len(numArray) rangeType := len(numArray)
if rangeType == 1 { switch rangeType {
case 1:
// single number // single number
singleNum, errRet := strconv.ParseInt(strings.TrimSpace(numArray[0]), 10, 64) singleNum, errRet := strconv.ParseInt(strings.TrimSpace(numArray[0]), 10, 64)
if errRet != nil { if errRet != nil {
@ -78,7 +79,7 @@ func ParseRangeNumbers(rangeStr string) (numbers []int64, err error) {
return return
} }
numbers = append(numbers, singleNum) numbers = append(numbers, singleNum)
} else if rangeType == 2 { case 2:
// range numbers // range numbers
min, errRet := strconv.ParseInt(strings.TrimSpace(numArray[0]), 10, 64) min, errRet := strconv.ParseInt(strings.TrimSpace(numArray[0]), 10, 64)
if errRet != nil { if errRet != nil {
@ -97,7 +98,7 @@ func ParseRangeNumbers(rangeStr string) (numbers []int64, err error) {
for i := min; i <= max; i++ { for i := min; i <= max; i++ {
numbers = append(numbers, i) numbers = append(numbers, i)
} }
} else { default:
err = fmt.Errorf("range number is invalid") err = fmt.Errorf("range number is invalid")
return return
} }

6
server/control.go
View File

@ -528,13 +528,13 @@ func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy) (remoteAddr string, err
err = fmt.Errorf("exceed the max_ports_per_client") err = fmt.Errorf("exceed the max_ports_per_client")
return return
} }
ctl.portsUsedNum = ctl.portsUsedNum + pxy.GetUsedPortsNum() ctl.portsUsedNum += pxy.GetUsedPortsNum()
ctl.mu.Unlock() ctl.mu.Unlock()
defer func() { defer func() {
if err != nil { if err != nil {
ctl.mu.Lock() ctl.mu.Lock()
ctl.portsUsedNum = ctl.portsUsedNum - pxy.GetUsedPortsNum() ctl.portsUsedNum -= pxy.GetUsedPortsNum()
ctl.mu.Unlock() ctl.mu.Unlock()
} }
}() }()
@ -570,7 +570,7 @@ func (ctl *Control) CloseProxy(closeMsg *msg.CloseProxy) (err error) {
} }
if ctl.serverCfg.MaxPortsPerClient > 0 { if ctl.serverCfg.MaxPortsPerClient > 0 {
ctl.portsUsedNum = ctl.portsUsedNum - pxy.GetUsedPortsNum() ctl.portsUsedNum -= pxy.GetUsedPortsNum()
} }
pxy.Close() pxy.Close()
ctl.pxyManager.Del(pxy.GetName()) ctl.pxyManager.Del(pxy.GetName())