dswd
/
vpncloud
mirror of https://github.com/dswd/vpncloud.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix ifname

This commit is contained in:
Dennis Schwerdel 2020-10-07 22:38:41 +02:00
parent 176e1956e6
commit 3cf1072da7
2 changed files with 311 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

658
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

10
src/device.rs
View File

@ -6,7 +6,7 @@ use libc::{c_short, c_ulong, ioctl, IFF_NO_PI, IFF_TAP, IFF_TUN, IF_NAMESIZE};
use std::{ use std::{
collections::VecDeque, collections::VecDeque,
fmt, fs, fmt, fs,
io::{self, Error as IoError, ErrorKind, Read, Write}, io::{self, Cursor, Error as IoError, ErrorKind, Read, Write},
os::unix::io::{AsRawFd, RawFd}, os::unix::io::{AsRawFd, RawFd},
str, str,
str::FromStr str::FromStr
@ -26,7 +26,7 @@ union IfReqData {
#[repr(C)] #[repr(C)]
struct IfReq { struct IfReq {
ifr_name: [u8; IF_NAMESIZE], ifr_name: [u8; IF_NAMESIZE],
data: IfReqData data: IfReqData
} }
impl IfReq { impl IfReq {
@ -150,8 +150,10 @@ impl TunTapDevice {
let res = unsafe { ioctl(fd.as_raw_fd(), TUNSETIFF, &mut ifreq) }; let res = unsafe { ioctl(fd.as_raw_fd(), TUNSETIFF, &mut ifreq) };
match res { match res {
0 => { 0 => {
let nul_range_end = ifreq.ifr_name.iter().position(|&c| c == b'\0').unwrap_or(ifreq.ifr_name.len()); let mut ifname = String::with_capacity(32);
let ifname = unsafe { str::from_utf8_unchecked(&ifreq.ifr_name[0..nul_range_end]) }.to_string(); let mut cursor = Cursor::new(ifreq.ifr_name);
cursor.read_to_string(&mut ifname)?;
ifname = ifname.trim_end_matches('\0').to_owned();
Ok(Self { fd, ifname, type_ }) Ok(Self { fd, ifname, type_ })
} }
_ => Err(IoError::last_os_error()) _ => Err(IoError::last_os_error())