Tests for bpf's, upgrade futures

Author: Danny Browning

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 failure = "~0.1"
 failure_derive = "~0.1"
-futures-preview = { version ="0.3.0-alpha.13", features = ["compat"] }
+futures-preview = { version ="0.3.0-alpha.14", features = ["compat"] }
 libc = "~0.2"
 log = "~0.4"
 pcap-sys = { git = "https://github.com/protectwise/pcap-sys.git" }

src/config.rs

@@ -51,7 +51,7 @@ impl Config {
         &self.bpf
     }
 
-    pub fn with_bf(&mut self, amt: String) -> &mut Self {
+    pub fn with_bpf(&mut self, amt: String) -> &mut Self {
         self.bpf = Some(amt);
         self
     }

src/handle.rs

@@ -147,7 +147,7 @@ impl Handle {
             bf_insns: std::ptr::null_mut(),
         };
 
-        let bpf_str = std::ffi::CString::new(bpf.to_string()).map_err(Error::Ffi)?;
+        let bpf_str = std::ffi::CString::new(bpf.clone()).map_err(Error::Ffi)?;
 
         if 0 != unsafe {
             pcap_sys::pcap_compile(
@@ -218,13 +218,17 @@ impl Handle {
             Ok(stats)
         }
     }
+
+    pub fn close(&self) {
+        unsafe {
+            pcap_sys::pcap_close(self.handle)
+        }
+    }
 }
 
 impl Drop for Handle {
     fn drop(&mut self) {
-        unsafe {
-            pcap_sys::pcap_close(self.handle);
-        }
+        self.close();
     }
 }
 

src/provider.rs

@@ -36,8 +36,8 @@ impl PacketProvider {
                 .set_buffer_size(config.buffer_size())?
                 .activate()?;
 
-            if let Some(ref s) = config.bpf() {
-                handle.set_bpf(s)?;
+            if let Some(bpf) = config.bpf() {
+                handle.set_bpf(bpf)?;
             }
         }
 
@@ -111,6 +111,23 @@ mod tests {
         );
     }
 
+    #[test]
+    fn packets_from_lookup_with_bpf() {
+        let _ = env_logger::try_init();
+
+        let mut cfg = Config::default();
+        cfg.with_bpf("(not (net 172.16.0.0/16 and port 443)) and (not (host 172.17.76.33 and port 443))".to_owned());
+
+        let handle = Handle::lookup().expect("No handle created");
+
+        let stream = PacketProvider::new(cfg, handle);
+
+        assert!(
+            stream.is_ok(),
+            format!("Could not build stream {}", stream.err().unwrap())
+        );
+    }
+
     #[bench]
     fn bench_packets_from_large_file(b: &mut Bencher) {
         let _ = env_logger::try_init();

src/stream.rs

@@ -28,8 +28,8 @@ impl PacketStream {
                 .set_buffer_size(config.buffer_size())?
                 .activate()?;
 
-            if let Some(ref s) = config.bpf() {
-                handle.set_bpf(s)?;
+            if let Some(bpf) = config.bpf() {
+                handle.set_bpf(bpf)?;
             }
         }
 
@@ -103,6 +103,22 @@ mod tests {
         );
     }
 
+    #[test]
+    fn packets_from_lookup_with_bpf() {
+        let _ = env_logger::try_init();
+
+        let mut cfg = Config::default();
+        cfg.with_bpf("(not (net 172.16.0.0/16 and port 443)) and (not (host 172.17.76.33 and port 443))".to_owned());
+        let handle = Handle::lookup().expect("No handle created");
+
+        let stream = PacketStream::new(cfg, handle);
+
+        assert!(
+            stream.is_ok(),
+            format!("Could not build stream {}", stream.err().unwrap())
+        );
+    }
+
     #[bench]
     fn bench_packets_from_large_file(b: &mut Bencher) {
         let _ = env_logger::try_init();