TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-11 00:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: fix split_address (fix #14909) (#22349)

Browse Source
This commit is contained in:
Felipe Pena 2024-09-30 02:25:39 -03:00 committed by GitHub
parent 6eec0b33c6
commit 04aba8f767
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vlib/net/util.v
View File

@ -15,17 +15,30 @@ pub fn validate_port(port int) !u16 {
// split_address splits an address into its host name and its port // split_address splits an address into its host name and its port
pub fn split_address(addr string) !(string, u16) { pub fn split_address(addr string) !(string, u16) {
port := addr.all_after_last(':').int() if _ := addr.index(']') {
mut address := addr.all_before_last(':') // ipv6 brackets
address := addr.all_after('[').all_before_last(']')
// TODO(emily): Maybe do some more checking here port := addr.all_after_last(']:').int()
// to validate ipv6 address sanity?
// RFC4038 - allow [::1]:port
if address.len > 0 && address[0] == `[` && address[address.len - 1] == `]` {
address = address[1..address.len - 1]
}
p := validate_port(port)! p := validate_port(port)!
return address, p return address, p
} else if _ := addr.index('::') {
// ipv6 host only ::1
if addr.all_before_last('::') == '' {
return addr, 0
} else {
// addr:port
address := addr.all_before_last(':')
port := addr.all_after_last(':').int()
p := validate_port(port)!
return address, p
}
} else if _ := addr.index(':') {
// addr:port
address := addr.all_before_last(':')
p := validate_port(addr.all_after_last(':').int())!
return address, p
} else {
// addr only
return addr, 0
}
} }