X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbgp_client.rs;h=dc5c6736a923fdfdbc2487d0fc51e2718034a40e;hb=7ef74563891ca09202cd0a59f96f516fa44318f7;hp=10880a6dc835c61965f17d3460eabc6597c7aa24;hpb=0c6846d425dea8331a586420c74f367cef879687;p=dnsseed-rust

diff --git a/src/bgp_client.rs b/src/bgp_client.rs
index 10880a6..dc5c673 100644
--- a/src/bgp_client.rs
+++ b/src/bgp_client.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::cmp;
-use std::collections::HashMap;
+use std::collections::{HashMap, hash_map};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::time::{Duration, Instant};
 
@@ -22,17 +22,63 @@ use futures::sync::mpsc;
 use crate::printer::{Printer, Stat};
 use crate::timeout_stream::TimeoutStream;
 
-const PATH_SUFFIX_LEN: usize = 3;
-struct Route {
+const PATH_SUFFIX_LEN: usize = 2;
+#[derive(Clone)]
+struct Route { // 32 bytes with a path id u32
 	path_suffix: [u32; PATH_SUFFIX_LEN],
 	path_len: u32,
 	pref: u32,
 	med: u32,
 }
+#[allow(dead_code)]
+const ROUTE_LEN: usize = 32 - std::mem::size_of::<(u32, Route)>();
+
+// To keep memory tight (and since we dont' need such close alignment), newtype the v4/v6 routing
+// table entries to make sure they are aligned to single bytes.
+
+#[repr(packed)]
+#[derive(PartialEq, Eq, Hash)]
+struct V4Addr {
+	addr: [u8; 4],
+	pfxlen: u8,
+}
+impl From<(Ipv4Addr, u8)> for V4Addr {
+	fn from(p: (Ipv4Addr, u8)) -> Self {
+		Self {
+			addr: p.0.octets(),
+			pfxlen: p.1,
+		}
+	}
+}
+#[allow(dead_code)]
+const V4_ALIGN: usize = 1 - std::mem::align_of::<V4Addr>();
+#[allow(dead_code)]
+const V4_SIZE: usize = 5 - std::mem::size_of::<V4Addr>();
+
+#[repr(packed)]
+#[derive(PartialEq, Eq, Hash)]
+struct V6Addr {
+	addr: [u8; 16],
+	pfxlen: u8,
+}
+impl From<(Ipv6Addr, u8)> for V6Addr {
+	fn from(p: (Ipv6Addr, u8)) -> Self {
+		Self {
+			addr: p.0.octets(),
+			pfxlen: p.1,
+		}
+	}
+}
+#[allow(dead_code)]
+const V6_ALIGN: usize = 1 - std::mem::align_of::<V6Addr>();
+#[allow(dead_code)]
+const V6_SIZE: usize = 17 - std::mem::size_of::<V6Addr>();
 
 struct RoutingTable {
-	v4_table: HashMap<(Ipv4Addr, u8), HashMap<u32, Arc<Route>>>,
-	v6_table: HashMap<(Ipv6Addr, u8), HashMap<u32, Arc<Route>>>,
+	// We really want a HashMap for the values here, but they'll only ever contain a few entries,
+	// and Vecs are way more memory-effecient in that case.
+	v4_table: HashMap<V4Addr, Vec<(u32, Route)>>,
+	v6_table: HashMap<V6Addr, Vec<(u32, Route)>>,
 }
 
 impl RoutingTable {
@@ -43,69 +89,94 @@ impl RoutingTable {
 		}
 	}
 
-	fn get_route_attrs(&self, ip: IpAddr) -> Vec<Arc<Route>> {
+	fn get_route_attrs(&self, ip: IpAddr) -> (u8, Vec<&Route>) {
 		macro_rules! lookup_res {
 			($addrty: ty, $addr: expr, $table: expr, $addr_bits: expr) => { {
 				//TODO: Optimize this (probably means making the tables btrees)!
-				for i in (0..$addr_bits).rev() {
-					let mut lookup = $addr.octets();
-					for b in 0..(i / 8) {
-						lookup[lookup.len() - b - 1] = 0;
-					}
-					lookup[lookup.len() - (i/8) - 1] &= !(((1u16 << (i % 8)) - 1) as u8);
-					let lookup_addr = <$addrty>::from(lookup);
-					if let Some(routes) = $table.get(&(lookup_addr, $addr_bits - i as u8)).map(|hm| hm.values()) {
+				let mut lookup = <$addrty>::from(($addr, $addr_bits));
+				for i in 0..$addr_bits {
+					if let Some(routes) = $table.get(&lookup) {
 						if routes.len() > 0 {
-							return routes.map(|x| Arc::clone(&x)).collect();
+							return (lookup.pfxlen, routes.iter().map(|v| &v.1).collect());
 						}
 					}
+					lookup.addr[lookup.addr.len() - (i/8) - 1] &= !(1u8 << (i % 8));
+					lookup.pfxlen -= 1;
 				}
-				vec![]
+				(0, vec![])
 			} }
 		}
 		match ip {
-			IpAddr::V4(v4a) => lookup_res!(Ipv4Addr, v4a, self.v4_table, 32),
-			IpAddr::V6(v6a) => lookup_res!(Ipv6Addr, v6a, self.v6_table, 128)
+			IpAddr::V4(v4a) => lookup_res!(V4Addr, v4a, self.v4_table, 32),
+			IpAddr::V6(v6a) => lookup_res!(V6Addr, v6a, self.v6_table, 128)
 		}
 	}
 
 	fn withdraw(&mut self, route: NLRIEncoding) {
+		macro_rules! remove {
+			($rt: expr, $v: expr, $id: expr) => { {
+				match $rt.entry($v.into()) {
+					hash_map::Entry::Occupied(mut entry) => {
+						entry.get_mut().retain(|e| e.0 != $id);
+						if entry.get_mut().is_empty() {
+							entry.remove();
+						}
+					},
+					_ => {},
+				}
+			} }
+		}
 		match route {
 			NLRIEncoding::IP(p) => {
 				let (ip, len) = <(IpAddr, u8)>::from(&p);
 				match ip {
-					IpAddr::V4(v4a) => self.v4_table.get_mut(&(v4a, len)).and_then(|hm| hm.remove(&0)),
-					IpAddr::V6(v6a) => self.v6_table.get_mut(&(v6a, len)).and_then(|hm| hm.remove(&0)),
+					IpAddr::V4(v4a) => remove!(self.v4_table, (v4a, len), 0),
+					IpAddr::V6(v6a) => remove!(self.v6_table, (v6a, len), 0),
 				}
 			},
 			NLRIEncoding::IP_WITH_PATH_ID((p, id)) => {
 				let (ip, len) = <(IpAddr, u8)>::from(&p);
 				match ip {
-					IpAddr::V4(v4a) => self.v4_table.get_mut(&(v4a, len)).and_then(|hm| hm.remove(&id)),
-					IpAddr::V6(v6a) => self.v6_table.get_mut(&(v6a, len)).and_then(|hm| hm.remove(&id)),
+					IpAddr::V4(v4a) => remove!(self.v4_table, (v4a, len), id),
+					IpAddr::V6(v6a) => remove!(self.v6_table, (v6a, len), id),
 				}
 			},
-			NLRIEncoding::IP_MPLS(_) => None,
+			NLRIEncoding::IP_MPLS(_) => (),
+			NLRIEncoding::IP_MPLS_WITH_PATH_ID(_) => (),
+			NLRIEncoding::IP_VPN_MPLS(_) => (),
+			NLRIEncoding::L2VPN(_) => (),
+			NLRIEncoding::FLOWSPEC(_) => (),
 		};
 	}
 
-	fn announce(&mut self, prefix: NLRIEncoding, route: Arc<Route>) {
+	fn announce(&mut self, prefix: NLRIEncoding, route: Route) {
+		macro_rules! insert {
+			($rt: expr, $v: expr, $id: expr) => { {
+				let entry = $rt.entry($v.into()).or_insert(Vec::new());
+				entry.retain(|e| e.0 != $id);
+				entry.push(($id, route));
+			} }
+		}
 		match prefix {
 			NLRIEncoding::IP(p) => {
 				let (ip, len) = <(IpAddr, u8)>::from(&p);
 				match ip {
-					IpAddr::V4(v4a) => self.v4_table.entry((v4a, len)).or_insert(HashMap::new()).insert(0, route),
-					IpAddr::V6(v6a) => self.v6_table.entry((v6a, len)).or_insert(HashMap::new()).insert(0, route),
+					IpAddr::V4(v4a) => insert!(self.v4_table, (v4a, len), 0),
+					IpAddr::V6(v6a) => insert!(self.v6_table, (v6a, len), 0),
 				}
 			},
 			NLRIEncoding::IP_WITH_PATH_ID((p, id)) => {
 				let (ip, len) = <(IpAddr, u8)>::from(&p);
 				match ip {
-					IpAddr::V4(v4a) => self.v4_table.entry((v4a, len)).or_insert(HashMap::new()).insert(id, route),
-					IpAddr::V6(v6a) => self.v6_table.entry((v6a, len)).or_insert(HashMap::new()).insert(id, route),
+					IpAddr::V4(v4a) => insert!(self.v4_table, (v4a, len), id),
+					IpAddr::V6(v6a) => insert!(self.v6_table, (v6a, len), id),
 				}
 			},
-			NLRIEncoding::IP_MPLS(_) => None,
+			NLRIEncoding::IP_MPLS(_) => (),
+			NLRIEncoding::IP_MPLS_WITH_PATH_ID(_) => (),
+			NLRIEncoding::IP_VPN_MPLS(_) => (),
+			NLRIEncoding::L2VPN(_) => (),
+			NLRIEncoding::FLOWSPEC(_) => (),
 		};
 	}
 }
@@ -133,8 +204,8 @@ impl<'a> std::io::Read for BytesDecoder<'a> {
 	}
 }
 
-struct MsgCoder<'a>(&'a Printer);
-impl<'a> codec::Decoder for MsgCoder<'a> {
+struct MsgCoder(Option<Capabilities>);
+impl codec::Decoder for MsgCoder {
 	type Item = Message;
 	type Error = std::io::Error;
 
@@ -143,13 +214,12 @@ impl<'a> codec::Decoder for MsgCoder<'a> {
 			buf: bytes,
 			pos: 0
 		};
-		match (Reader {
+		let def_cap = Default::default();
+		let mut reader = Reader {
 			stream: &mut decoder,
-			capabilities: Capabilities {
-				FOUR_OCTET_ASN_SUPPORT: true,
-				EXTENDED_PATH_NLRI_SUPPORT: true,
-			}
-		}).read() {
+			capabilities: if let Some(cap) = &self.0 { cap } else { &def_cap },
+		};
+		match reader.read() {
 			Ok((_header, msg)) => {
 				decoder.buf.advance(decoder.pos);
 				Ok(Some(msg))
@@ -161,12 +231,12 @@ impl<'a> codec::Decoder for MsgCoder<'a> {
 		}
 	}
 }
-impl<'a> codec::Encoder for MsgCoder<'a> {
+impl codec::Encoder for MsgCoder {
 	type Item = Message;
 	type Error = std::io::Error;
 
 	fn encode(&mut self, msg: Message, res: &mut bytes::BytesMut) -> Result<(), std::io::Error> {
-		msg.write(&mut BytesCoder(res))?;
+		msg.encode(&mut BytesCoder(res))?;
 		Ok(())
 	}
 }
@@ -177,7 +247,8 @@ pub struct BGPClient {
 }
 impl BGPClient {
 	pub fn get_asn(&self, addr: IpAddr) -> u32 {
-		let mut path_vecs = self.routes.lock().unwrap().get_route_attrs(addr).clone();
+		let lock = self.routes.lock().unwrap();
+		let mut path_vecs = lock.get_route_attrs(addr).1;
 		if path_vecs.is_empty() { return 0; }
 
 		path_vecs.sort_unstable_by(|path_a, path_b| {
@@ -205,6 +276,21 @@ impl BGPClient {
 		0
 	}
 
+	pub fn get_path(&self, addr: IpAddr) -> (u8, [u32; PATH_SUFFIX_LEN]) {
+		let lock = self.routes.lock().unwrap();
+		let (prefixlen, mut path_vecs) = lock.get_route_attrs(addr);
+		if path_vecs.is_empty() { return (0, [0; PATH_SUFFIX_LEN]); }
+
+		path_vecs.sort_unstable_by(|path_a, path_b| {
+			path_a.pref.cmp(&path_b.pref)
+				.then(path_b.path_len.cmp(&path_a.path_len))
+				.then(path_b.med.cmp(&path_a.med))
+		});
+
+		let primary_route = path_vecs.pop().unwrap();
+		(prefixlen, primary_route.path_suffix)
+	}
+
 	pub fn disconnect(&self) {
 		self.shutdown.store(true, Ordering::Relaxed);
 	}
@@ -261,7 +347,7 @@ impl BGPClient {
 						future::err(())
 					})
 				}).and_then(move |stream| {
-					let (write, read) = Framed::new(stream.0, MsgCoder(printer)).split();
+					let (write, read) = Framed::new(stream.0, MsgCoder(None)).split();
 					let (mut sender, receiver) = mpsc::channel(10); // We never really should send more than 10 messages unless they're dumb
 					tokio::spawn(write.sink_map_err(|_| { () }).send_all(receiver)
 						.then(|_| {
@@ -280,7 +366,7 @@ impl BGPClient {
 							OpenCapability::AddPath(vec![
 								(AFI::IPV4, SAFI::Unicast, AddPathDirection::ReceivePaths),
 								(AFI::IPV6, SAFI::Unicast, AddPathDirection::ReceivePaths)]),
-						])]
+						])],
 					}));
 					TimeoutStream::new_persistent(read, timeout).for_each(move |bgp_msg| {
 						if client.shutdown.load(Ordering::Relaxed) {
@@ -302,9 +388,8 @@ impl BGPClient {
 									route_table.withdraw(r);
 								}
 								if let Some(path) = Self::map_attrs(upd.attributes) {
-									let path_arc = Arc::new(path);
 									for r in upd.announced_routes {
-										route_table.announce(r, Arc::clone(&path_arc));
+										route_table.announce(r, path.clone());
 									}
 								}
 								printer.set_stat(Stat::V4RoutingTableSize(route_table.v4_table.len()));