net/relayd: add ip protocol for redirections (#2391)

net/relayd/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		relayd
-PLUGIN_VERSION=		2.5
+PLUGIN_VERSION=		2.6
 PLUGIN_DEPENDS=		relayd
 PLUGIN_COMMENT=		Relayd Load Balancer
 PLUGIN_MAINTAINER=	frank.brendel@eurolog.com

net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/virtualserver.xml

@@ -35,6 +35,14 @@
          Specify an address to listen on.]]>
       </help>
    </field>
+   <field>
+      <id>relayd.virtualserver.listen_proto</id>
+      <label>Listen IP Protocol</label>
+      <type>dropdown</type>
+      <help><![CDATA[
+         Specify an IP protocol for the listener.]]>
+      </help>
+   </field>
    <field>
       <id>relayd.virtualserver.listen_startport</id>
       <label>Listen Port</label>

net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml

@@ -1,6 +1,6 @@
 <model>
    <mount>//OPNsense/relayd</mount>
-   <version>1.0.3</version>
+   <version>1.0.4</version>
    <description>Relayd settings</description>
    <items>
       <general>
@@ -175,6 +175,14 @@
             <ChangeCase>lower</ChangeCase>
             <ValidationMessage>Please specify a valid servername or IP address.</ValidationMessage>
          </listen_address>
+         <listen_proto type="OptionField">
+             <Required>Y</Required>
+             <default>tcp</default>
+             <OptionValues>
+                 <tcp>TCP</tcp>
+                 <udp>UDP</udp>
+             </OptionValues>
+         </listen_proto>
          <listen_startport type="PortField">
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
@@ -296,6 +304,15 @@
             <ValidationMessage>Table check not found</ValidationMessage>
             <multiple>N</multiple>
             <Required>N</Required>
+            <Constraints>
+                <check001>
+                    <ValidationMessage>Table check must be set.</ValidationMessage>
+                    <type>DependConstraint</type>
+                    <addFields>
+                        <field1>backuptransport_table</field1>
+                    </addFields>
+                </check001>
+            </Constraints>
          </backuptransport_tablecheck>
          <backuptransport_tablemode type="OptionField">
             <default>roundrobin</default>

net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt

@@ -117,6 +117,7 @@ POSSIBILITY OF SUCH DAMAGE.
          var transport_tablemode = $('#relayd\\.virtualserver\\.transport_tablemode').val();
          var backuptransport_tablemode = $('#relayd\\.virtualserver\\.backuptransport_tablemode').val();
 
+         $('tr[id="row_relayd.virtualserver.listen_proto"]').addClass('hidden');
          $('tr[id="row_relayd.virtualserver.transport_type"]').addClass('hidden');
          $('tr[id="row_relayd.virtualserver.routing_interface"]').addClass('hidden');
          $('tr[id="row_relayd.virtualserver.stickyaddress"]').addClass('hidden');
@@ -129,6 +130,7 @@ POSSIBILITY OF SUCH DAMAGE.
          $('#relayd\\.virtualserver\\.backuptransport_tablemode').empty().append('<option value="roundrobin">Round Robin </option>');
 
          if(servertype == 'redirect'){
+            $('tr[id="row_relayd.virtualserver.listen_proto"]').removeClass('hidden');
             $('tr[id="row_relayd.virtualserver.transport_type"]').removeClass('hidden');
             if(transport_type == 'route'){
                $('tr[id="row_relayd.virtualserver.routing_interface"]').removeClass('hidden');

net/relayd/src/opnsense/service/templates/OPNsense/Relayd/relayd.conf

@@ -62,6 +62,9 @@ table <{{ table.name }}>{{ disable }} {
 disable
 {%        endif %}
 {%        set listen = "listen on " ~ virtualserver.listen_address %}
+{%        if virtualserver.listen_proto is defined and virtualserver.type == 'redirect' %}
+{%          set listen = listen ~ " " ~ virtualserver.listen_proto %}
+{%        endif %}
 {%        if virtualserver.listen_startport is defined %}
 {%          set listen = listen ~ " port " ~ virtualserver.listen_startport %}
 {%          if virtualserver.listen_endport is defined and virtualserver.type == 'redirect'%}