From 79b6ab6af2356cb53c2a7ee5a52dc66f5369af4f Mon Sep 17 00:00:00 2001 From: Nathaniel Bennett Date: Mon, 4 Nov 2024 17:07:47 -0500 Subject: [PATCH] Fix additional `i8` to `libc::c_char` implicit conversions --- src/linux.rs | 3 ++- src/tap.rs | 4 ++-- src/tun.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/linux.rs b/src/linux.rs index a22cc45..863a38b 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -23,7 +23,8 @@ use std::{io, net::IpAddr}; use crate::{AddAddress, AddressInfo, DeviceState, Interface}; -pub(crate) const DEV_NET_TUN: *const i8 = b"/dev/net/tun\0".as_ptr() as *const i8; +pub(crate) const DEV_NET_TUN: *const libc::c_char = + b"/dev/net/tun\0".as_ptr() as *const libc::c_char; // TODO: include Generic Receive Offset variant of Tun/Tap // diff --git a/src/tap.rs b/src/tap.rs index c5aee63..e07549b 100644 --- a/src/tap.rs +++ b/src/tap.rs @@ -172,7 +172,7 @@ mod tests { fn given_name() { use std::ffi::CStr; - let chosen_name = unsafe { CStr::from_ptr(b"feth24\0".as_ptr() as *const i8) }; + let chosen_name = unsafe { CStr::from_ptr(b"feth24\0".as_ptr() as *const libc::c_char) }; let iface = Interface::from_cstr(chosen_name).unwrap(); let tun = Tap::new_named(iface).unwrap(); @@ -186,7 +186,7 @@ mod tests { fn given_name() { use std::ffi::CStr; - let chosen_name = unsafe { CStr::from_ptr(b"tap24\0".as_ptr() as *const i8) }; + let chosen_name = unsafe { CStr::from_ptr(b"tap24\0".as_ptr() as *const libc::c_char) }; let iface = Interface::from_cstr(chosen_name).unwrap(); let tap = Tap::new_named(iface).unwrap(); diff --git a/src/tun.rs b/src/tun.rs index aee0381..b7fc085 100644 --- a/src/tun.rs +++ b/src/tun.rs @@ -218,7 +218,7 @@ mod tests { fn given_name() { use std::ffi::CStr; - let chosen_name = unsafe { CStr::from_ptr(b"utun24\0".as_ptr() as *const i8) }; + let chosen_name = unsafe { CStr::from_ptr(b"utun24\0".as_ptr() as *const libc::c_char) }; let iface = Interface::from_cstr(chosen_name).unwrap(); let tun = Tun::new_named(iface).unwrap();