sigoden/dufs
1
0
Fork 0
mirror of https://github.com/sigoden/dufs.git synced 2026-06-07 15:59:03 +03:00
Code Issues 66 Packages Projects Releases 10 Wiki Activity

refactor: handle unspecified ip addrs in check_addrs (#708)

Browse Source
This commit is contained in:
sigoden
2026-05-20 09:28:00 +08:00
committed by GitHub
parent b69946df23
commit f97a47f625
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+18 -15
View File
@@ -211,28 +211,31 @@ fn create_listener(addr: SocketAddr) -> Result<TcpListener> {
fn check_addrs(args: &Args) -> Result<(Vec<BindAddr>, Vec<BindAddr>)> { fn check_addrs(args: &Args) -> Result<(Vec<BindAddr>, Vec<BindAddr>)> {
let mut new_addrs = vec![]; let mut new_addrs = vec![];
let mut print_addrs = vec![]; let mut print_addrs = vec![];
let (ipv4_addrs, ipv6_addrs) = interface_addrs()?; let has_unspecified = args
.addrs
.iter()
.any(|a| matches!(a, BindAddr::IpAddr(ip) if ip.is_unspecified()));
let (ipv4_addrs, ipv6_addrs) = if has_unspecified {
interface_addrs()?
} else {
(vec![], vec![])
};
for bind_addr in args.addrs.iter() { for bind_addr in args.addrs.iter() {
new_addrs.push(bind_addr.clone());
match bind_addr { match bind_addr {
BindAddr::IpAddr(ip) => match &ip { BindAddr::IpAddr(ip) => match &ip {
IpAddr::V4(_) => { IpAddr::V4(_) => {
if !ipv4_addrs.is_empty() { if ip.is_unspecified() {
new_addrs.push(bind_addr.clone()); print_addrs.extend(ipv4_addrs.clone());
if ip.is_unspecified() { } else {
print_addrs.extend(ipv4_addrs.clone()); print_addrs.push(bind_addr.clone());
} else {
print_addrs.push(bind_addr.clone());
}
} }
} }
IpAddr::V6(_) => { IpAddr::V6(_) => {
if !ipv6_addrs.is_empty() { if ip.is_unspecified() {
new_addrs.push(bind_addr.clone()); print_addrs.extend(ipv6_addrs.clone());
if ip.is_unspecified() { } else {
print_addrs.extend(ipv6_addrs.clone()); print_addrs.push(bind_addr.clone());
} else {
print_addrs.push(bind_addr.clone())
}
} }
} }
}, },