From 068418ef218eb0109c5df6d325f05a6f3b22ee55 Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Fri, 23 Feb 2024 14:05:13 +0000 Subject: T6054: WLB: fix rules parsing when using multiple ports in one rule (cherry picked from commit 6d79c73d4fa2d26197c1bc19df215a204af6c5dd) --- data/templates/load-balancing/wlb.conf.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data/templates') diff --git a/data/templates/load-balancing/wlb.conf.j2 b/data/templates/load-balancing/wlb.conf.j2 index 6557b6f4c..7f04d797e 100644 --- a/data/templates/load-balancing/wlb.conf.j2 +++ b/data/templates/load-balancing/wlb.conf.j2 @@ -93,6 +93,8 @@ rule {{ rule }} { {% if rule_config.destination.port is vyos_defined %} {% if '-' in rule_config.destination.port %} port-ipt "-m multiport --dports {{ rule_config.destination.port | replace('-', ':') }}" +{% elif ',' in rule_config.destination.port %} + port-ipt "-m multiport --dports {{ rule_config.destination.port }}" {% else %} port-ipt " --dport {{ rule_config.destination.port }}" {% endif %} @@ -107,6 +109,8 @@ rule {{ rule }} { {% if rule_config.source.port is vyos_defined %} {% if '-' in rule_config.source.port %} port-ipt "-m multiport --sports {{ rule_config.source.port | replace('-', ':') }}" +{% elif ',' in rule_config.destination.port %} + port-ipt "-m multiport --sports {{ rule_config.source.port }}" {% else %} port.ipt " --sport {{ rule_config.source.port }}" {% endif %} -- cgit v1.2.3