Firewall: Automation: Filter - add TOS/DSCP for https://github.com/opnsense/core/issues/8143

This commit is contained in:
Ad Schellevis 2025-01-01 14:48:11 +01:00
parent c49af7824a
commit 23e20aab3c
4 changed files with 73 additions and 0 deletions

1
plist
View File

@ -716,6 +716,7 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/ScheduleField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/TosField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Group.php

View File

@ -290,6 +290,11 @@
data payload will be assigned this priority when offered.
</help>
</field>
<field>
<id>rule.tos</id>
<label>Match TOS / DSCP</label>
<type>dropdown</type>
</field>
<field>
<type>header</type>
<label>Internal tagging</label>

View File

@ -0,0 +1,66 @@
<?php
/*
* Copyright (C) 2025 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
namespace OPNsense\Firewall\FieldTypes;
use OPNsense\Base\FieldTypes\BaseListField;
class TosField extends BaseListField
{
private static $tos_values = [];
protected function actionPostLoadingEvent()
{
if (empty(self::$tos_values)) {
self::$tos_values = [
'' => gettext('Any'),
'lowdelay' => gettext('lowdelay'),
'critical' => gettext('critical'),
'inetcontrol' => gettext('inetcontrol'),
'netcontrol' => gettext('netcontrol'),
'throughput' => gettext('throughput'),
'reliability' => gettext('reliability'),
'ef' => 'EF',
];
foreach (array(11, 12, 13, 21, 22, 23, 31, 32, 33, 41 ,42, 43) as $val) {
self::$tos_values["af$val"] = "AF$val";
}
foreach (range(0, 7) as $val) {
self::$tos_values["cs$val"] = "CS$val";
}
foreach (range(0, 255) as $val) {
self::$tos_values['0x' . dechex($val)] = sprintf('0x%02X', $val);
}
}
$this->internalOptionList = self::$tos_values;
return parent::actionPostLoadingEvent();
}
}

View File

@ -247,6 +247,7 @@
<ValidationMessage>Related category not found.</ValidationMessage>
</categories>
<sched type=".\ScheduleField"/>
<tos type=".\TosField"/>
<description type="DescriptionField"/>
</rule>
</rules>