From 7d31047a38979d685a5a467d382201c317a69869 Mon Sep 17 00:00:00 2001 From: Viktor G Date: Wed, 20 Apr 2022 09:13:24 +0300 Subject: [PATCH] Traffic Shaper Wizard ipprotocol fix. Issue #12937 --- .../www/wizards/traffic_shaper_wizard_dedicated.inc | 9 +++++++-- .../www/wizards/traffic_shaper_wizard_multi_all.inc | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index fe5451e9b46..eaa997a64a9 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1483,7 +1483,13 @@ function apply_all_chosen_items() { $rule = array(); $rule['type'] = "match"; $rule['interface'] = $interfacelist; - $rule['ipprotocol'] = "inet46"; + if (is_ipaddrv4($config['ezshaper']['step4']['address'])) { + $rule['ipprotocol'] = "inet"; + } elseif (is_ipaddrv6($config['ezshaper']['step4']['address'])) { + $rule['ipprotocol'] = "inet6"; + } else { + $rule['ipprotocol'] = "inet46"; + } $rule['descr'] = gettext("Penalty Box"); if ($otherpriority) { $rule['defaultqueue'] = "qOthersLow"; @@ -1532,7 +1538,6 @@ function apply_all_chosen_items() { $rule['type'] = "match"; $rule['interface'] = "any"; $rule['ipprotocol'] = $ipprotocol; - $rule['ipprotocol'] = "inet46"; $rule['descr'] = gettext("Connections To Upstream SIP Server"); $rule['protocol'] = "udp"; $rule['defaultqueue'] = "qVoIP"; diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index dd187ac4b8a..78504ec6265 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1569,7 +1569,13 @@ function apply_all_chosen_items() { $rule = array(); $rule['type'] = "match"; $rule['interface'] = $interfacelist; - $rule['ipprotocol'] = "inet46"; + if (is_ipaddrv4($config['ezshaper']['step4']['address'])) { + $rule['ipprotocol'] = "inet"; + } elseif (is_ipaddrv6($config['ezshaper']['step4']['address'])) { + $rule['ipprotocol'] = "inet6"; + } else { + $rule['ipprotocol'] = "inet46"; + } $rule['descr'] = gettext("Penalty Box"); if ($otherpriority) { $rule['defaultqueue'] = "qOthersLow";