use crate::printer::{Printer, Stat};
use crate::timeout_stream::TimeoutStream;
-const PATH_SUFFIX_LEN: usize = 2;
+const PATH_SUFFIX_LEN: usize = 3;
#[derive(Clone)]
struct Route { // 32 bytes with a path id u32
path_suffix: [u32; PATH_SUFFIX_LEN],
med: u32,
}
#[allow(dead_code)]
-const ROUTE_LEN: usize = 32 - std::mem::size_of::<(u32, Route)>();
+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.
impl RoutingTable {
fn new() -> Self {
Self {
- v4_table: HashMap::new(),
- v6_table: HashMap::new(),
+ v4_table: HashMap::with_capacity(900_000),
+ v6_table: HashMap::with_capacity(100_000),
}
}
}
},
NLRIEncoding::IP_MPLS(_) => (),
+ NLRIEncoding::IP_MPLS_WITH_PATH_ID(_) => (),
+ NLRIEncoding::IP_VPN_MPLS(_) => (),
+ NLRIEncoding::L2VPN(_) => (),
};
}
}
},
NLRIEncoding::IP_MPLS(_) => (),
+ NLRIEncoding::IP_MPLS_WITH_PATH_ID(_) => (),
+ NLRIEncoding::IP_VPN_MPLS(_) => (),
+ NLRIEncoding::L2VPN(_) => (),
};
}
}
}
}
-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;
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() {
}
}
}
-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(())
}
}
});
let primary_route = path_vecs.pop().unwrap();
- 'asn_candidates: for asn in primary_route.path_suffix.iter().rev() {
- if *asn == 0 { continue 'asn_candidates; }
- for secondary_route in path_vecs.iter() {
- if !secondary_route.path_suffix.contains(asn) {
- continue 'asn_candidates;
+ if path_vecs.len() > 3 {
+ // If we have at least 3 paths, try to find the last unique ASN which doesn't show up in other paths
+ // If we hit a T1 that is reasonably assumed to care about net neutrality, return the
+ // previous ASN.
+ let mut prev_asn = 0;
+ 'asn_candidates: for asn in primary_route.path_suffix.iter().rev() {
+ if *asn == 0 { continue 'asn_candidates; }
+ match *asn {
+ // Included: CenturyLink (L3), Cogent, Telia, NTT, GTT, Level3,
+ // GBLX (L3), Zayo, TI Sparkle Seabone, HE, Telefonica
+ // Left out from Caida top-20: TATA, PCCW, Vodafone, RETN, Orange, Telstra,
+ // Singtel, Rostelecom, DTAG
+ 209|174|1299|2914|3257|3356|3549|6461|6762|6939|12956 if prev_asn != 0 => return prev_asn,
+ _ => if path_vecs.iter().any(|route| !route.path_suffix.contains(asn)) {
+ if prev_asn != 0 { return prev_asn } else {
+ // Multi-origin prefix, just give up and take the last AS in the
+ // default path
+ break 'asn_candidates;
+ }
+ } else {
+ // We only ever possibly return an ASN if it appears in all paths
+ prev_asn = *asn;
+ },
}
}
- return *asn;
+ // All paths were the same, if the first ASN is non-0, return it.
+ if prev_asn != 0 {
+ return prev_asn;
+ }
}
for asn in primary_route.path_suffix.iter().rev() {
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(|_| {
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) {