From 5833541a6e97d3eb850d843b1dd95a73d986f234 Mon Sep 17 00:00:00 2001
From: "Sijie.Sun" <sunsijie@buaa.edu.cn>
Date: Sun, 25 Aug 2024 12:27:00 +0800
Subject: [PATCH] set correct route cost for peers relayed by public server
 (#279)

---
 easytier/src/utils.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/easytier/src/utils.rs b/easytier/src/utils.rs
index 5f4c214..70cdbad 100644
--- a/easytier/src/utils.rs
+++ b/easytier/src/utils.rs
@@ -114,10 +114,18 @@ pub fn list_peer_route_pair(peers: Vec<PeerInfo>, routes: Vec<Route>) -> Vec<Pee
 
     for route in routes.iter() {
         let peer = peers.iter().find(|peer| peer.peer_id == route.peer_id);
-        pairs.push(PeerRoutePair {
+        let has_tunnel = peer.map(|p| !p.conns.is_empty()).unwrap_or(false);
+        let mut pair = PeerRoutePair {
             route: route.clone(),
             peer: peer.cloned(),
-        });
+        };
+
+        // it is relayed by public server, adjust the cost
+        if !has_tunnel && pair.route.cost == 1 {
+            pair.route.cost = 2;
+        }
+
+        pairs.push(pair);
     }
 
     pairs