1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-09-12 01:24:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Optimize container port detection mechanism

Browse source
This commit is contained in:
ssongliu 2025-09-01 11:04:42 +08:00
parent 663196c3d9
commit 37efaa4fb1
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
agent/app/service/container.go
View file

@ -1429,7 +1429,7 @@ func checkPortStats(ports []dto.PortHelper) (nat.PortMap, error) {
portMap[nat.Port(fmt.Sprintf("%d/%s", containerStart+i, port.Protocol))] = []nat.PortBinding{bindItem} portMap[nat.Port(fmt.Sprintf("%d/%s", containerStart+i, port.Protocol))] = []nat.PortBinding{bindItem}
} }
for i := hostStart; i <= hostEnd; i++ { for i := hostStart; i <= hostEnd; i++ {
if common.ScanPort(i) { if common.ScanPortWithIP(port.HostIP, i) {
return portMap, buserr.WithDetail("ErrPortInUsed", i, nil) return portMap, buserr.WithDetail("ErrPortInUsed", i, nil)
} }
} }
@ -1440,7 +1440,7 @@ func checkPortStats(ports []dto.PortHelper) (nat.PortMap, error) {
} else { } else {
portItem, _ = strconv.Atoi(port.HostPort) portItem, _ = strconv.Atoi(port.HostPort)
} }
if common.ScanPort(portItem) { if common.ScanPortWithIP(port.HostIP, portItem) {
return portMap, buserr.WithDetail("ErrPortInUsed", portItem, nil) return portMap, buserr.WithDetail("ErrPortInUsed", portItem, nil)
} }
bindItem := nat.PortBinding{HostPort: strconv.Itoa(portItem), HostIP: port.HostIP} bindItem := nat.PortBinding{HostPort: strconv.Itoa(portItem), HostIP: port.HostIP}

18
agent/utils/common/common.go
View file

@ -212,6 +212,24 @@ func ScanPortWithProto(port int, proto string) bool {
return ScanPort(port) return ScanPort(port)
} }
func ScanPortWithIP(ip string, port int) bool {
if len(ip) == 0 {
return ScanPort(port)
}
address := net.JoinHostPort(ip, fmt.Sprintf("%d", port))
timeout := time.Second * 2
conn, err := net.DialTimeout("tcp", address, timeout)
if err != nil {
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
return true
}
return false
}
defer conn.Close()
return true
}
func IsNum(s string) bool { func IsNum(s string) bool {
_, err := strconv.ParseFloat(s, 64) _, err := strconv.ParseFloat(s, 64)
return err == nil return err == nil