konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

rest-server: drop proxmox-io dependency

Browse Source 
Used only for read/writing a pid_t (an integer) to a socket.
The standard to_ne_bytes()/from_ne_bytes() should be sufficient here,
we already have libc::pid_t which we can use to get the correct type
namespace for accessing ::from_ne_bytes().

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2024-07-24 13:44:27 +02:00
parent c0e5776edd
commit a38b46b27d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxmox-rest-server/Cargo.toml
View File

@ -39,7 +39,6 @@ url.workspace = true
proxmox-async.workspace = true
proxmox-compression.workspace = true
proxmox-http = { workspace = true, optional = true }
proxmox-io.workspace = true
proxmox-lang.workspace = true
proxmox-log.workspace = true
proxmox-router.workspace = true

8
proxmox-rest-server/src/daemon.rs
View File

@ -14,7 +14,6 @@ use anyhow::{bail, format_err, Error};
use futures::future::{self, Either};
use nix::unistd::{fork, ForkResult};
use proxmox_io::{ReadExt, WriteExt};
use proxmox_sys::fd::fd_change_cloexec;
use proxmox_sys::fs::CreateOptions;
@ -107,7 +106,7 @@ impl Reloader {
match std::panic::catch_unwind(move || {
let mut pnew = std::fs::File::from(pnew);
let pid = nix::unistd::Pid::this();
if let Err(e) = unsafe { pnew.write_host_value(pid.as_raw()) } {
if let Err(e) = pnew.write_all(&pid.as_raw().to_ne_bytes()) {
log::error!("failed to send new server PID to parent: {}", e);
unsafe {
libc::_exit(-1);
@ -169,8 +168,9 @@ impl Reloader {
);
std::mem::drop(pnew);
let mut pold = std::fs::File::from(pold);
let child = nix::unistd::Pid::from_raw(match unsafe { pold.read_le_value() } {
Ok(v) => v,
let mut child_pid = (0 as libc::pid_t).to_ne_bytes();
let child = nix::unistd::Pid::from_raw(match pold.read_exact(&mut child_pid) {
Ok(()) => libc::pid_t::from_ne_bytes(child_pid),
Err(e) => {
log::error!(
"failed to receive pid of double-forked child process: {}",