Light Cleanup [Spring Cleaning 2/N]

bfd/src/lib.rs

@@ -251,6 +251,7 @@ pub enum AddPeerError {
 #[cfg(test)]
 mod test {
     use super::*;
+    use mg_common::eprintln_nopipe;
     use pretty_assertions::assert_eq;
     use slog::Drain;
     use std::net::IpAddr;
@@ -311,11 +312,11 @@ mod test {
                                 tx.send((addr, msg)).unwrap();
                             }
                             None => {
-                                eprintln!("no egress for {}", addr);
+                                eprintln_nopipe!("no egress for {}", addr);
                             }
                         },
                         Err(e) => {
-                            eprintln!("recv: {}", e);
+                            eprintln_nopipe!("recv: {}", e);
                         }
                     }
                 }

bgp/src/connection_channel.rs

@@ -84,6 +84,7 @@ impl std::fmt::Display for Network {
 #[derive(Debug)]
 struct Listener {
     rx: Receiver<(SocketAddr, Endpoint<Message>)>,
+    addr: SocketAddr,
 }
 
 impl Listener {
@@ -98,6 +99,12 @@ impl Listener {
     }
 }
 
+impl Drop for Listener {
+    fn drop(&mut self) {
+        NET.unbind(&self.addr);
+    }
+}
+
 // NOTE: this is not designed to be a full fidelity TCP/IP drop in. It gives
 // us enough functionality to pass messages between BGP routers to test
 // state machine transitions above TCP connection tracking. That's all we're
@@ -113,7 +120,12 @@ impl Network {
     fn bind(&self, sa: SocketAddr) -> Listener {
         let (tx, rx) = mpsc_channel();
         lock!(self.endpoints).insert(sa, tx);
-        Listener { rx }
+        Listener { rx, addr: sa }
+    }
+
+    /// Remove a bound address from the network.
+    fn unbind(&self, addr: &SocketAddr) {
+        lock!(self.endpoints).remove(addr);
     }
 
     /// Send a copy of the provided endpoint to the endpoint identified by the

bgp/src/connection_tcp.rs

@@ -559,6 +559,8 @@ impl BgpConnectionTcp {
         direction: ConnectionDirection,
         config: &SessionInfo,
     ) -> Result<Self, Error> {
+        conn.set_nodelay(true)?;
+
         let id = ConnectionId::new(source, peer);
 
         let dropped = Arc::new(AtomicBool::new(false));

bgp/src/messages.rs

@@ -5949,7 +5949,7 @@ impl From<PathAttribute> for Option<PathAttributeV1> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use mg_common::{cidr, ip, parse};
+    use mg_common::{cidr, ip, parse, println_nopipe};
     use pretty_assertions::assert_eq;
     use pretty_hex::*;
     use std::net::{Ipv4Addr, Ipv6Addr};
@@ -6004,7 +6004,7 @@ mod tests {
         };
 
         let buf = h0.to_wire();
-        println!("buf: {}", buf.hex_dump());
+        println_nopipe!("buf: {}", buf.hex_dump());
 
         assert_eq!(
             buf,
@@ -6025,7 +6025,7 @@ mod tests {
         let om0 = OpenMessage::new4(395849, 0x1234, 0xaabbccdd, false);
 
         let buf = om0.to_wire().expect("open message to wire");
-        println!("buf: {}", buf.hex_dump());
+        println_nopipe!("buf: {}", buf.hex_dump());
 
         let om1 = OpenMessage::from_wire(&buf).expect("open message from wire");
         assert_eq!(om0, om1);
@@ -6036,7 +6036,7 @@ mod tests {
         let om0 = OpenMessage::new4(395849, 0x1234, 0xaabbccdd, true);
 
         let buf = om0.to_wire().expect("open message to wire");
-        println!("buf: {}", buf.hex_dump());
+        println_nopipe!("buf: {}", buf.hex_dump());
 
         let om1 = OpenMessage::from_wire(&buf).expect("open message from wire");
         assert_eq!(om0, om1);
@@ -6085,7 +6085,7 @@ mod tests {
         };
 
         let buf = um0.to_wire().expect("update message to wire");
-        println!("buf: {}", buf.hex_dump());
+        println_nopipe!("buf: {}", buf.hex_dump());
 
         let um1 =
             UpdateMessage::from_wire(&buf).expect("update message from wire");

bgp/src/policy.rs

@@ -235,12 +235,13 @@ pub fn new_rhai_engine() -> Engine {
 
     #[cfg(debug_assertions)]
     {
-        println!("Functions registered:");
+        use mg_common::println_nopipe;
+        println_nopipe!("Functions registered:");
         engine
             .gen_fn_signatures(false)
             .into_iter()
-            .for_each(|func| println!("{func}"));
-        println!();
+            .for_each(|func| println_nopipe!("{func}"));
+        println_nopipe!();
     }
 
     engine