GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-10-27 16:00:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(watchdog): 修复 musl 下 ioctl 请求参数类型不匹配

Browse Source
This commit is contained in:
mofeng-git
2026-10-13 22:11:55 +08:00
parent 1d40b34f1c
commit 2b53c2982b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/watchdog/mod.rs
View File

@@ -14,6 +14,8 @@ mod platform {
use std::os::unix::fs::{FileTypeExt, MetadataExt}; use std::os::unix::fs::{FileTypeExt, MetadataExt};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
// Request arguments use c_ulong on glibc and c_int on musl. Cast at the
// call sites to preserve the kernel command's low 32 bits on either libc.
const WDIOC_GETSUPPORT: libc::c_ulong = 0x8028_5700; const WDIOC_GETSUPPORT: libc::c_ulong = 0x8028_5700;
const WDIOC_SETOPTIONS: libc::c_ulong = 0x8004_5704; const WDIOC_SETOPTIONS: libc::c_ulong = 0x8004_5704;
const WDIOC_KEEPALIVE: libc::c_ulong = 0x8004_5705; const WDIOC_KEEPALIVE: libc::c_ulong = 0x8004_5705;
@@ -54,7 +56,7 @@ mod platform {
let supports_magic_close = unsafe { let supports_magic_close = unsafe {
libc::ioctl( libc::ioctl(
std::os::fd::AsRawFd::as_raw_fd(&file), std::os::fd::AsRawFd::as_raw_fd(&file),
WDIOC_GETSUPPORT, WDIOC_GETSUPPORT as _,
&mut info, &mut info,
) == 0 ) == 0
&& info.options & WDIOF_MAGICCLOSE != 0 && info.options & WDIOF_MAGICCLOSE != 0
@@ -109,7 +111,7 @@ mod platform {
let result = unsafe { let result = unsafe {
libc::ioctl( libc::ioctl(
std::os::fd::AsRawFd::as_raw_fd(&self.file), std::os::fd::AsRawFd::as_raw_fd(&self.file),
WDIOC_KEEPALIVE, WDIOC_KEEPALIVE as _,
0, 0,
) )
}; };
@@ -125,7 +127,7 @@ mod platform {
let result = unsafe { let result = unsafe {
libc::ioctl( libc::ioctl(
std::os::fd::AsRawFd::as_raw_fd(&self.file), std::os::fd::AsRawFd::as_raw_fd(&self.file),
WDIOC_GETTIMEOUT, WDIOC_GETTIMEOUT as _,
&mut timeout, &mut timeout,
) )
}; };
@@ -152,7 +154,7 @@ mod platform {
let result = unsafe { let result = unsafe {
libc::ioctl( libc::ioctl(
std::os::fd::AsRawFd::as_raw_fd(&self.file), std::os::fd::AsRawFd::as_raw_fd(&self.file),
WDIOC_SETOPTIONS, WDIOC_SETOPTIONS as _,
&mut option, &mut option,
) )
}; };