Bump dep

[dnsseed-rust] / src / bgp_client.rs

diff --git a/src/bgp_client.rs b/src/bgp_client.rs
index 8f264c660e49840674137be1192ed75cf1ec1b26..a96de047731edc1bf0e958e61394e66d248f4a6a 100644 (file)
--- a/src/bgp_client.rs
+++ b/src/bgp_client.rs
@@ -46,14 +46,14 @@ impl RoutingTable {
                        ($addrty: ty, $addr: expr, $table: expr, $addr_bits: expr) => { {
                                let mut res = Vec::new();
                                //TODO: Optimize this!
-                               for i in (0..($addr_bits + 1)).rev() {
+                               for i in (0..$addr_bits).rev() {
                                        let mut lookup = $addr.octets();
                                        for b in 0..(i / 8) {
-                                               lookup[lookup.len() - b] = 0;
+                                               lookup[lookup.len() - b - 1] = 0;
                                        }
-                                       lookup[lookup.len() - (i/8)] &= !(((1u16 << (i % 8)) - 1) as u8);
+                                       lookup[lookup.len() - (i/8) - 1] &= !(((1u16 << (i % 8)) - 1) as u8);
                                        let lookup_addr = <$addrty>::from(lookup);
-                                       for attrs in $table.range((Included((lookup_addr, $addr_bits, 0)), Included((lookup_addr, $addr_bits, std::u32::MAX)))) {
+                                       for attrs in $table.range((Included((lookup_addr, $addr_bits - i as u8, 0)), Included((lookup_addr, $addr_bits - i as u8, std::u32::MAX)))) {
                                                res.push(Arc::clone(&attrs.1));
                                        }
                                        if !res.is_empty() { break; }
@@ -182,7 +182,7 @@ impl BGPClient {
                                .then(path_b.med.cmp(&path_a.med))
                });
                // TODO: Find last common ASN among all paths
-               *path_vecs[0].path.last().unwrap_or(&0)
+               *path_vecs.first().map(|route| route.path.last().unwrap_or(&0)).unwrap_or(&0)
        }
 
        pub fn disconnect(&self) {
@@ -257,7 +257,9 @@ impl BGPClient {
                                        }
                                        match bgp_msg {
                                                Message::Open(_) => {
-                                                       printer.add_line("Connected to BGP route provider".to_string(), true);
+                                                       client.routes.lock().unwrap().v4_table.clear();
+                                                       client.routes.lock().unwrap().v6_table.clear();
+                                                       printer.add_line("Connected to BGP route provider".to_string(), false);
                                                },
                                                Message::KeepAlive => {
                                                        let _ = sender.try_send(Message::KeepAlive);