renet/renet
renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bpf ffi and add OpenBSD bpf cfg 

This fixes the ordering that was causing a dealloc before the FFI call
to libc open.
This commit is contained in:
Nathan K. Zhinn 2021-02-17 15:11:56 +00:00
parent 9d1e57efec
commit 019653b0cf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/phy/sys/bpf.rs
View File

@ -6,16 +6,16 @@ use libc;
use super::{ifreq, ifreq_for};
/// set interface
#[cfg(target_os = "macos")]
#[cfg(any(target_os = "macos", target_os = "openbsd"))]
const BIOCSETIF: libc::c_ulong = 0x8020426c;
/// get buffer length
#[cfg(target_os = "macos")]
#[cfg(any(target_os = "macos", target_os = "openbsd"))]
const BIOCGBLEN: libc::c_ulong = 0x40044266;
/// set immediate/nonblocking read
#[cfg(target_os = "macos")]
#[cfg(any(target_os = "macos", target_os = "openbsd"))]
const BIOCIMMEDIATE: libc::c_ulong = 0x80044270;
// TODO: check if this is same for OSes other than macos
#[cfg(target_os = "macos")]
#[cfg(any(target_os = "macos", target_os = "openbsd"))]
const BPF_HDRLEN: usize = 18;
macro_rules! try_ioctl {
@ -43,8 +43,8 @@ impl AsRawFd for BpfDevice {
fn open_device() -> io::Result<libc::c_int> {
unsafe {
for i in 0..256 {
let dev = format!("/dev/bpf{}\0", i).as_ptr() as *const libc::c_char;
match libc::open(dev, libc::O_RDWR) {
let dev = format!("/dev/bpf{}\0", i);
match libc::open(dev.as_ptr() as *const libc::c_char, libc::O_RDWR) {
-1 => continue,
fd => return Ok(fd),
};