proxmox-mirrors/proxmox-firewall
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-firewall synced 2025-10-04 12:55:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firewall: wait for nft process

Browse Source 
NftClient never waits for the child process to terminate leading to
defunct leftover processes.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Stefan Hanreich 2024-04-19 15:00:25 +02:00 committed by Thomas Lamprecht
parent 11954b1a08
commit 7438bb262a
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
proxmox-nftables/src/client.rs
View File

@ -36,35 +36,15 @@ impl NftClient {
return Err(NftError::from(error)); return Err(NftError::from(error));
}; };
let mut error_output = String::new(); let output = child.wait_with_output().map_err(NftError::from)?;
match child if output.status.success() {
.stderr Ok(String::from_utf8(output.stdout).expect("output is valid utf-8"))
.take() } else {
.expect("can get stderr") Err(NftError::Command(
.read_to_string(&mut error_output) String::from_utf8(output.stderr).expect("output is valid utf-8"),
{ ))
Ok(_) if !error_output.is_empty() => {
return Err(NftError::Command(error_output));
} }
Err(error) => {
return Err(NftError::from(error));
}
_ => (),
};
let mut output = String::new();
if let Err(error) = child
.stdout
.take()
.expect("can get stdout")
.read_to_string(&mut output)
{
return Err(NftError::from(error));
};
Ok(output)
} }
pub fn run_json_commands(commands: &Commands) -> Result<Option<CommandOutput>, NftError> { pub fn run_json_commands(commands: &Commands) -> Result<Option<CommandOutput>, NftError> {