Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/address.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//! Provides functions to parse input IP addresses, CIDRs or files.
use std::collections::BTreeSet;
use std::fs::{self, File};
use std::io::{prelude::*, BufReader};
use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
Expand Down Expand Up @@ -27,6 +28,8 @@ use crate::warning;
///
/// let ips = parse_addresses(&opts);
/// ```
///
/// Finally, any duplicates are removed to avoid excessive scans.
pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
let mut ips: Vec<IpAddr> = Vec::new();
let mut unresolved_addresses: Vec<&str> = Vec::new();
Expand Down Expand Up @@ -66,7 +69,10 @@ pub fn parse_addresses(input: &Opts) -> Vec<IpAddr> {
}
}

ips
ips.into_iter()
.collect::<BTreeSet<_>>()
.into_iter()
.collect()
}

/// Given a string, parse it as a host, IP address, or CIDR.
Expand Down Expand Up @@ -256,6 +262,16 @@ mod tests {
assert_eq!(ips.len(), 0);
}

#[test]
fn parse_duplicate_cidrs() {
let mut opts = Opts::default();
opts.addresses = vec!["79.98.104.0/21".to_owned(), "79.98.104.0/24".to_owned()];

let ips = parse_addresses(&opts);

assert_eq!(ips.len(), 2_048);
}

#[test]
fn resolver_default_cloudflare() {
let opts = Opts::default();
Expand Down