add location info to paths

1 files changed, 31 insertions, 13 deletions

diff --git a/src/transport/paths.rs b/src/transport/paths.rs
index 6696e1a..1f6d078 100644
--- a/src/transport/paths.rs
+++ b/src/transport/paths.rs
@@ -334,6 +334,7 @@ impl Table {
         let path = self.paths.get(address);
         PathInfo {
             address: address.to_owned(),
+            location: None,
             rtt_ms: path
                 .and_then(|path| path.rtt)
                 .map(|rtt| rtt.as_secs_f64() * 1000.0),
@@ -439,11 +440,25 @@ impl Paths {
     /// What paths knows about each of `addresses`.
     pub(crate) fn info(&self, addresses: &[String]) -> Vec<PathInfo> {
         let now = Instant::now();
-        let table = self.table.lock_or_recover();
-        addresses
-            .iter()
-            .map(|address| table.info(address, now))
-            .collect()
+        let infos = {
+            let table = self.table.lock_or_recover();
+            addresses
+                .iter()
+                .map(|address| table.info(address, now))
+                .collect()
+        };
+        self.located(infos)
+    }
+
+    /// `infos` with where each path goes (`Transport::location`); asked outside the
+    /// table's lock.
+    fn located(&self, mut infos: Vec<PathInfo>) -> Vec<PathInfo> {
+        for info in &mut infos {
+            info.location = self
+                .split(&info.address)
+                .and_then(|(link, target)| link.inner.location(&target));
+        }
+        infos
     }
 
     /// Whether `address` is one of ours.
@@ -643,16 +658,19 @@ impl Paths {
             stats.merge(link.inner.stats());
         }
         let now = Instant::now();
-        let table = self.table.lock_or_recover();
-        let mut paths: Vec<PathInfo> = table
-            .paths
-            .keys()
-            .map(|address| table.info(address, now))
-            .collect();
+        let (mut paths, counts) = {
+            let table = self.table.lock_or_recover();
+            let paths: Vec<PathInfo> = table
+                .paths
+                .keys()
+                .map(|address| table.info(address, now))
+                .collect();
+            (paths, table.counts)
+        };
         paths.sort_by(|a, b| a.address.cmp(&b.address));
         stats.paths = Some(PathsStats {
-            paths,
-            counts: table.counts,
+            paths: self.located(paths),
+            counts,
         });
         stats
     }