tcjlj/flvx
1
0
Fork 0
mirror of https://github.com/Sagit-chu/flvx.git synced 2026-10-07 02:06:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tunnel): restore upstream ipv6 address normalization logic

Browse Source
This commit is contained in:
qimaoww
2026-03-09 02:59:35 +08:00
parent f8809d73fb
commit a2ec08f033
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go-backend/internal/http/handler/control_plane.go
+5 -9
View File
@@ -1620,27 +1620,23 @@ func processServerAddress(serverAddr string) string {
if strings.HasPrefix(serverAddr, "[") { if strings.HasPrefix(serverAddr, "[") {
return serverAddr return serverAddr
} }
if looksLikeIPv6(serverAddr) {
return "[" + strings.Trim(serverAddr, "[]") + "]"
}
idx := strings.LastIndex(serverAddr, ":") idx := strings.LastIndex(serverAddr, ":")
if idx < 0 { if idx < 0 {
if looksLikeIPv6(serverAddr) {
return "[" + serverAddr + "]"
}
return serverAddr return serverAddr
} }
if strings.Count(serverAddr, ":") != 1 {
return "[" + strings.Trim(serverAddr, "[]") + "]"
}
host := strings.TrimSpace(serverAddr[:idx]) host := strings.TrimSpace(serverAddr[:idx])
port := strings.TrimSpace(serverAddr[idx+1:]) port := strings.TrimSpace(serverAddr[idx+1:])
if host == "" || port == "" { if host == "" || port == "" {
return serverAddr return serverAddr
} }
if looksLikeIPv6(host) { if looksLikeIPv6(host) {
return "[" + strings.Trim(host, "[]") + "]:" + port return "[" + host + "]:" + port
} }
return host + ":" + port return serverAddr
} }
func normalizeServerAddressInput(serverAddr string) string { func normalizeServerAddressInput(serverAddr string) string {