From 85b83f8eb18f1f3162533979cff6ac0884ae895f Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 15 May 2026 17:44:35 +0200 Subject: [PATCH] feat: Remove reliability on iptables multiport extension (#1140) --- src/network.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/network.sh b/src/network.sh index 3f67690..4ee60c5 100644 --- a/src/network.sh +++ b/src/network.sh @@ -351,7 +351,7 @@ configurePasst() { PASST_OPTS+=" -H $VM_NET_HOST" PASST_OPTS+=" -M $GATEWAY_MAC" - PASST_OPTS+=" -P $PASST_PID" + PASST_OPTS+=" -P $PASST_PID" PASST_OPTS+=" -l $log" PASST_OPTS+=" -q" @@ -361,7 +361,10 @@ configurePasst() { fi PASST_OPTS=$(echo "$PASST_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//') - [[ "$DEBUG" == [Yy1]* ]] && printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}" + + if [[ "$DEBUG" == [Yy1]* || "$PASST_DEBUG" == [Yy1]* ]]; then + printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}" + fi [ ! -f "$PASST" ] && cp /usr/bin/passt* /run @@ -495,11 +498,7 @@ configureNAT() { exclude=$(getHostPorts) if [ -n "$exclude" ]; then - if [[ "$exclude" != *","* ]]; then - exclude=" ! --dport $exclude" - else - exclude=" -m multiport ! --dports $exclude" - fi + exclude=" ! --dport ${exclude//,/ ! --dport }" fi if ! iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE > /dev/null 2>&1; then