guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use go built-in min & max functions to replace lo.Min and lo.Max (#4007)

This commit is contained in:
fatedier 2024-02-19 21:27:56 +08:00 committed by GitHub
parent adb04e81e7
commit b6361fb143
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/nathole/analysis.go
View File

@ -224,7 +224,7 @@ func (mhr *MakeHoleRecords) ReportSuccess(mode int, index int) {
} }
score.Score += 2 score.Score += 2
score.Score = lo.Min([]int{score.Score, 10}) score.Score = min(score.Score, 10)
return return
} }
} }

6
pkg/nathole/controller.go
View File

@ -317,7 +317,7 @@ func (c *Controller) analysis(session *Session) (*msg.NatHoleResp, *msg.NatHoleR
session.cBehavior = cBehavior session.cBehavior = cBehavior
session.vBehavior = vBehavior session.vBehavior = vBehavior
timeoutMs := lo.Max([]int{cBehavior.SendDelayMs, vBehavior.SendDelayMs}) + 5000 timeoutMs := max(cBehavior.SendDelayMs, vBehavior.SendDelayMs) + 5000
if cBehavior.ListenRandomPorts > 0 || vBehavior.ListenRandomPorts > 0 { if cBehavior.ListenRandomPorts > 0 || vBehavior.ListenRandomPorts > 0 {
timeoutMs += 30000 timeoutMs += 30000
} }
@ -384,8 +384,8 @@ func getRangePorts(addrs []string, difference, maxNumber int) []msg.PortsRange {
return nil return nil
} }
ports = append(ports, msg.PortsRange{ ports = append(ports, msg.PortsRange{
From: lo.Max([]int{port - difference - 5, port - maxNumber, 1}), From: max(port-difference-5, port-maxNumber, 1),
To: lo.Min([]int{port + difference + 5, port + maxNumber, 65535}), To: min(port+difference+5, port+maxNumber, 65535),
}) })
return ports return ports
} }