diff --git a/net/relayd/Makefile b/net/relayd/Makefile index c2b1ecb6f..9d050f298 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= relayd -PLUGIN_VERSION= 2.1 +PLUGIN_VERSION= 2.2 PLUGIN_DEPENDS= relayd PLUGIN_COMMENT= Relayd Load Balancer PLUGIN_MAINTAINER= frank.brendel@eurolog.com diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php index 04cd42736..0869cd1ea 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php @@ -151,6 +151,11 @@ class SettingsController extends ApiControllerBase $relaydInfo[$nodeType]['backuptransport_tablemode'] ); } + if ($relaydInfo[$nodeType]['transport_type'] == 'route' && + empty($relaydInfo[$nodeType]['routing_interface'])) { + $result['validations']['relayd.virtualserver.routing_interface'] = + gettext('Routing interface cannot be empty'); + } } if ($relaydInfo[$nodeType]['type'] == 'relay') { if ($relaydInfo[$nodeType]['transport_tablemode'] == 'least-states') { diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/virtualserver.xml b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/virtualserver.xml index 20d7a6c90..66636718d 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/virtualserver.xml +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/virtualserver.xml @@ -70,6 +70,15 @@ true + + relayd.virtualserver.routing_interface + + dropdown + + + true + relayd.virtualserver.transport_table diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml index dbc3b4518..1a307965f 100644 --- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml +++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml @@ -1,6 +1,6 @@ //OPNsense/relayd - 1.0.0 + 1.0.1 Relayd settings @@ -181,6 +181,14 @@ Route + + N + N + + /^(?!0).*$/ + /^((?!dhcp).)*$/ + +