Npcap thread-safe read; &self for send/recv

rscap/src/bpf.rs

@@ -95,8 +95,8 @@ impl SnifferImpl {
     }
 
     #[inline]
-    pub fn send(&self, packet: &[u8]) -> io::Result<usize> {
-        self.bpf.send(packet)
+    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.bpf.send(buf)
     }
 
     #[inline]

rscap/src/bpf/l2.rs

@@ -522,14 +522,8 @@ impl Bpf {
 
     /// Send a link-layer packet on the interface bound to the given socket.
     #[inline]
-    pub fn send(&self, packet: &[u8]) -> io::Result<usize> {
-        let res = unsafe {
-            libc::write(
-                self.fd,
-                packet.as_ptr() as *const libc::c_void,
-                packet.len(),
-            )
-        };
+    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        let res = unsafe { libc::write(self.fd, buf.as_ptr() as *const libc::c_void, buf.len()) };
         match res {
             0.. => Ok(res as usize),
             _ => Err(io::Error::last_os_error()),

rscap/src/linux.rs

@@ -450,8 +450,8 @@ impl SnifferImpl {
     }
 
     #[inline]
-    pub fn send(&self, packet: &[u8]) -> io::Result<usize> {
-        self.socket.send(packet)
+    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.socket.send(buf)
     }
 
     #[inline]

rscap/src/npcap.rs

@@ -51,7 +51,7 @@ pub(crate) struct SnifferImpl {
 impl SnifferImpl {
     #[inline]
     pub fn new(iface: Interface) -> io::Result<Self> {
-        let mut adapter = NpcapAdapter::new(iface)?;
+        let adapter = NpcapAdapter::new(iface)?;
         adapter.set_filter(&mut PacketFilter::reject_all())?;
 
         Ok(Self { adapter })
@@ -71,7 +71,7 @@ impl SnifferImpl {
     }
 
     #[inline]
-    pub fn set_nonblocking(&mut self, nonblocking: bool) -> io::Result<()> {
+    pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
         self.adapter.set_nonblocking(nonblocking);
         Ok(())
     }
@@ -82,12 +82,12 @@ impl SnifferImpl {
     }
 
     #[inline]
-    pub fn send(&mut self, packet: &[u8]) -> io::Result<usize> {
-        self.adapter.send(packet)
+    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.adapter.send(buf)
     }
 
     #[inline]
-    pub fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+    pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
         self.adapter.recv(buf)
     }
 }