Przeglądaj źródła

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

fatedier 11 miesięcy temu
rodzic
commit
b6361fb143
2 zmienionych plików z 4 dodań i 4 usunięć
  1. 1 1
      pkg/nathole/analysis.go
  2. 3 3
      pkg/nathole/controller.go

+ 1 - 1
pkg/nathole/analysis.go

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

+ 3 - 3
pkg/nathole/controller.go

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