Merge pull request #1 from fanatid/nat-local-ip-range

Add `local-ip-range` argument

Author: linuskendall

client/src/main.rs

@@ -567,7 +567,7 @@ fn fetch(
     let State { peers, cidrs } = api.http("GET", "/user/state")?;
 
     let device = Device::get(interface, opts.network.backend)?;
-    let modifications = device.diff(&peers);
+    let mut modifications = device.diff(&peers);
 
     let updates = modifications
         .iter()
@@ -621,6 +621,34 @@ fn fetch(
     if nat.no_nat_traversal {
         log::debug!("NAT traversal explicitly disabled, not attempting.");
     } else {
+        let mut peers = Vec::with_capacity(modifications.len());
+        if let Some(local_ip_range) = nat.local_ip_range {
+            for diff in &modifications {
+                peers.push(
+                    diff.new
+                        .cloned()
+                        .map(|mut peer| {
+                            let mut candidates = vec![];
+                            let mut rest = vec![];
+                            for endpoint in peer.candidates.drain(..) {
+                                let addr = endpoint.resolve().with_str(endpoint.to_string())?;
+                                if local_ip_range.contains(&addr.ip()) {
+                                    candidates.push(endpoint);
+                                } else {
+                                    rest.push(endpoint);
+                                }
+                            }
+                            candidates.append(&mut rest);
+                            peer.candidates = candidates;
+                            Ok::<_, anyhow::Error>(peer)
+                        })
+                        .transpose()?,
+                );
+            }
+            for (i, mut diff) in modifications.iter_mut().enumerate() {
+                diff.new = peers.get(i).expect("same length").as_ref();
+            }
+        }
         let mut nat_traverse = NatTraverse::new(interface, opts.network.backend, &modifications)?;
 
         // Give time for handshakes with recently changed endpoints to complete before attempting traversal.

shared/src/types.rs

@@ -437,6 +437,11 @@ pub struct NatOpts {
     /// Don't report any candidates to coordinating server.
     /// Shorthand for --exclude-nat-candidates '0.0.0.0/0'.
     pub no_nat_candidates: bool,
+
+    #[clap(long)]
+    /// Priorities candidads from given IP range.
+    /// ex. --local-ip-range '192.168.10.0/24'
+    pub local_ip_range: Option<IpNet>,
 }
 
 impl NatOpts {
@@ -445,6 +450,7 @@ impl NatOpts {
             no_nat_traversal: true,
             exclude_nat_candidates: vec![],
             no_nat_candidates: true,
+            local_ip_range: None,
         }
     }