X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbgp_client.rs;h=60c80cf0ad9dbfda7fe172548868e7960f61c333;hb=1e966747a23601301d3dd1e861702ff7c7bd6568;hp=9038005a3d412aadc075bf26422c38ee32ed494b;hpb=8e27de4c043eb7967697c8c38b2e0b65bf546b8c;p=dnsseed-rust

diff --git a/src/bgp_client.rs b/src/bgp_client.rs
index 9038005..60c80cf 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};
 
@@ -24,12 +24,14 @@ use crate::timeout_stream::TimeoutStream;
 
 const PATH_SUFFIX_LEN: usize = 3;
 #[derive(Clone)]
-struct Route { // 32 bytes
+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 = 36 - 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.
@@ -48,6 +50,10 @@ impl From<(Ipv4Addr, u8)> for V4Addr {
 		}
 	}
 }
+#[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)]
@@ -63,10 +69,16 @@ impl From<(Ipv6Addr, u8)> for V6Addr {
 		}
 	}
 }
+#[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<V4Addr, HashMap<u32, Route>>,
-	v6_table: HashMap<V6Addr, HashMap<u32, 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 {
@@ -83,9 +95,9 @@ impl RoutingTable {
 				//TODO: Optimize this (probably means making the tables btrees)!
 				let mut lookup = <$addrty>::from(($addr, $addr_bits));
 				for i in 0..$addr_bits {
-					if let Some(routes) = $table.get(&lookup).map(|hm| hm.values()) {
+					if let Some(routes) = $table.get(&lookup) {
 						if routes.len() > 0 {
-							return (lookup.pfxlen, routes.collect());
+							return (lookup.pfxlen, routes.iter().map(|v| &v.1).collect());
 						}
 					}
 					lookup.addr[lookup.addr.len() - (i/8) - 1] &= !(1u8 << (i % 8));
@@ -101,42 +113,68 @@ impl RoutingTable {
 	}
 
 	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).into()).and_then(|hm| hm.remove(&0)),
-					IpAddr::V6(v6a) => self.v6_table.get_mut(&(v6a, len).into()).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).into()).and_then(|hm| hm.remove(&id)),
-					IpAddr::V6(v6a) => self.v6_table.get_mut(&(v6a, len).into()).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(_) => (),
 		};
 	}
 
 	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).into()).or_insert(HashMap::new()).insert(0, route),
-					IpAddr::V6(v6a) => self.v6_table.entry((v6a, len).into()).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).into()).or_insert(HashMap::new()).insert(id, route),
-					IpAddr::V6(v6a) => self.v6_table.entry((v6a, len).into()).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(_) => (),
 		};
 	}
 }
@@ -164,8 +202,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;
 
@@ -174,15 +212,17 @@ 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);
+				if let Message::Open(ref o) = &msg {
+					self.0 = Some(Capabilities::from_parameters(o.parameters.clone()));
+				}
 				Ok(Some(msg))
 			},
 			Err(e) => match e.kind() {
@@ -192,12 +232,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(())
 	}
 }
@@ -308,7 +348,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(|_| {
@@ -327,7 +367,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) {