NotAShelf/nff
2
1
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

nff: improve diagnostics and vmap expression handling in parser and formatter

Browse source
This commit is contained in:
raf 2025-06-02 09:31:44 +03:00
commit e0f93d0307
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
3 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/syntax.rs
View file

@ -175,10 +175,11 @@ impl NftablesFormatter {
// Add policy on the same line if present
if let Some(policy) = &chain.policy {
write!(output, " policy {}", policy).unwrap();
output.push_str(";\n");
} else {
output.push_str("\n");
}
output.push_str(";\n");
if !chain.rules.is_empty() && !self.config.optimize {
output.push('\n');
}
@ -294,8 +295,11 @@ impl NftablesFormatter {
}
Expression::Vmap { expr, map } => {
self.format_expression(output, expr);
output.push_str(" vmap { ");
if let Some(expr) = expr {
self.format_expression(output, expr);
output.push(' ');
}
output.push_str("vmap { ");
for (i, (key, value)) in map.iter().enumerate() {
if i > 0 {
output.push_str(", ");