zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allows square brackets in network config listen addr / external add (#8504)

This commit is contained in:
Arya 2024-05-07 15:47:08 -04:00 committed by GitHub
parent 6506d73df5
commit 3e264c73a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra-network/src/config.rs
View File

@ -739,7 +739,7 @@ impl<'de> Deserialize<'de> for Config {
} }
}; };
let listen_addr = match listen_addr.parse::<SocketAddr>() { let listen_addr = match listen_addr.parse::<SocketAddr>().or_else(|_| format!("{listen_addr}:{}", network.default_port()).parse()) {
Ok(socket) => Ok(socket), Ok(socket) => Ok(socket),
Err(_) => match listen_addr.parse::<IpAddr>() { Err(_) => match listen_addr.parse::<IpAddr>() {
Ok(ip) => Ok(SocketAddr::new(ip, network.default_port())), Ok(ip) => Ok(SocketAddr::new(ip, network.default_port())),
@ -750,7 +750,7 @@ impl<'de> Deserialize<'de> for Config {
}?; }?;
let external_socket_addr = if let Some(address) = &external_addr { let external_socket_addr = if let Some(address) = &external_addr {
match address.parse::<SocketAddr>() { match address.parse::<SocketAddr>().or_else(|_| format!("{address}:{}", network.default_port()).parse()) {
Ok(socket) => Ok(Some(socket)), Ok(socket) => Ok(Some(socket)),
Err(_) => match address.parse::<IpAddr>() { Err(_) => match address.parse::<IpAddr>() {
Ok(ip) => Ok(Some(SocketAddr::new(ip, network.default_port()))), Ok(ip) => Ok(Some(SocketAddr::new(ip, network.default_port()))),