From 0dcf97a33de2b80c71c222a7fdbf306448d47900 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 9 Feb 2019 13:56:35 +0100
Subject: [PATCH 1/5] Update dialogRule.xml

---
 .../OPNsense/TrafficShaper/forms/dialogRule.xml            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
index 53894f519..b2d864d6c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
@@ -68,6 +68,13 @@
         <type>text</type>
         <help>Destination port number or well known name (imap, imaps, http, https, ...), for ranges use a dash</help>
     </field>
+    <field>
+        <id>rule.dscp</id>
+        <label>DSCP</label>
+        <type>select_multiple</type>
+        <advanced>true</advanced>
+        <help>Match against one or multiple DSCP values.</help>
+    </field>
     <field>
         <id>rule.direction</id>
         <label>direction</label>

From b47844923822353a9841941ec816ef93e824a323 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 9 Feb 2019 14:08:33 +0100
Subject: [PATCH 2/5] Update TrafficShaper.xml

---
 .../OPNsense/TrafficShaper/TrafficShaper.xml  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index a0fdc6b5a..32abc88a2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -305,6 +305,33 @@
                     <EnableRanges>Y</EnableRanges>
                     <default>any</default>
                 </dst_port>
+                <dscp type="OptionField">
+                    <Required>N</Required>
+                    <Multiple>Y</Multiple>
+                    <OptionValues>
+                        <be>Best Effort</be>
+                        <ef>Expedited Forwarding</ef>
+                        <af11>AF11</af11>
+                        <af12>AF12</af12>
+                        <af13>AF13</af13>
+                        <af21>AF21</af21>
+                        <af22>AF22</af22>
+                        <af23>AF23</af23>
+                        <af31>AF31</af31>
+                        <af32>AF32</af32>
+                        <af33>AF33</af33>
+                        <af41>AF41</af41>
+                        <af42>AF42</af42>
+                        <af43>AF43</af43>
+                        <cs1>CS1</cs1>
+                        <cs2>CS2</cs2>
+                        <cs3>CS3</cs3>
+                        <cs4>CS4</cs4>                
+                        <cs5>CS5</cs5>
+                        <cs6>CS6</cs6>
+                        <cs7>CS7</cs7>
+                    </OptionValues>
+                </dscp>
                 <direction type="OptionField">
                     <Required>N</Required>
                     <default></default>

From 4c1e2f05a82720672a1f916b23fcac6e02077bba Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 10 Feb 2019 07:58:05 +0100
Subject: [PATCH 3/5] Update ipfw.conf

---
 .../service/templates/OPNsense/IPFW/ipfw.conf       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
index 8432a3c3e..6d0826884 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
@@ -184,8 +184,9 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     if rule.destination_not|default('0') == '1' %}not {% endif %}{{rule.destination
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} recv {{
     physical_interface(rule.interface) }} {%
-    if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif
-    %} xmit {{physical_interface(rule.interface2)
+    if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %}{%
+    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }}
+    xmit {{physical_interface(rule.interface2)
     }} // {{rule.interface}} -> {{rule.interface2}}: {{helpers.getUUID(rule.target).description}}
 {%                         endif %}
 {%                         if rule.direction == 'out' or not rule.direction %}
@@ -195,8 +196,9 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     if rule.destination_not|default('0') == '1' %}not {% endif %}{{rule.destination
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} xmit {{
     physical_interface(rule.interface) }} {%
-    if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif
-    %} recv {{physical_interface(rule.interface2)
+    if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %}{%
+    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }}
+    recv {{physical_interface(rule.interface2)
     }} // {{rule.interface2}} -> {{rule.interface}}: {{helpers.getUUID(rule.target).description}}
 {%                         endif %}
 {%                       else %}
@@ -206,7 +208,8 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     if rule.source_not|default('0') == '1' %}not {% endif %}{{ rule.source }} to {%
     if rule.destination_not|default('0') == '1' %}not {% endif %}{{rule.destination
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} {{rule.direction}} {%
-    if rule.proto.split('_')[1]|default('') == 'ack' %}{{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %} via {{
+    if rule.proto.split('_')[1]|default('') == 'ack' %}{{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %} {%
+    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }} via {{
     physical_interface(rule.interface)
     }} // {{rule.interface}}: {{helpers.getUUID(rule.target).description}}
 {%                       endif %}

From bd9c67794ce4f394c60c8be8c25d1c5f444a330a Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 10 Feb 2019 15:15:42 +0100
Subject: [PATCH 4/5] Update ipfw.conf

---
 src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
index 6d0826884..f6fcf1bd6 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
@@ -185,7 +185,7 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} recv {{
     physical_interface(rule.interface) }} {%
     if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %}{%
-    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }}
+    if rule.dscp|default('') != '' %} dscp {{ (rule.dscp.split(',')) }}{% endif %}
     xmit {{physical_interface(rule.interface2)
     }} // {{rule.interface}} -> {{rule.interface2}}: {{helpers.getUUID(rule.target).description}}
 {%                         endif %}
@@ -197,7 +197,7 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} xmit {{
     physical_interface(rule.interface) }} {%
     if rule.proto.split('_')[1]|default('') == 'ack' %} {{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %}{%
-    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }}
+    if rule.dscp|default('') != '' %} dscp {{ (rule.dscp.split(',')) }}{% endif %}
     recv {{physical_interface(rule.interface2)
     }} // {{rule.interface2}} -> {{rule.interface}}: {{helpers.getUUID(rule.target).description}}
 {%                         endif %}
@@ -209,7 +209,7 @@ add {{loop.index + 60000}} {{ helpers.getUUIDtag(rule.target) }} {{
     if rule.destination_not|default('0') == '1' %}not {% endif %}{{rule.destination
     }} src-port  {{ rule.src_port }} dst-port {{ rule.dst_port }} {{rule.direction}} {%
     if rule.proto.split('_')[1]|default('') == 'ack' %}{{ rule.proto.split('_')[2]|default('') }} tcpflags ack {% endif %} {%
-    if rule.dscp != '' %} dscp {{ (rule.dscp.split(',')) }} via {{
+    if rule.dscp|default('') != '' %} dscp {{ (rule.dscp.split(',')) }}{% endif %} via {{
     physical_interface(rule.interface)
     }} // {{rule.interface}}: {{helpers.getUUID(rule.target).description}}
 {%                       endif %}

From d14f9c0330ed3a8d2f0b6486a90505a278559252 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 10 Feb 2019 15:22:26 +0100
Subject: [PATCH 5/5] Update TrafficShaper.xml

---
 .../mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 32abc88a2..d48c37248 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/TrafficShaper</mount>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <description>
         OPNsense traffic shaper
     </description>