From fd1eabe72862ec364643a61cb94b21c330a385f5 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 28 Aug 2018 21:58:46 +0200
Subject: T810: bugfix broadcast-relay address validator, add 'disable'
 functionality

Whole broadcast relay service can be temporary disabled via
  set service broadcast-relay disable

Individual instances of the broadcast relay service can be disabled
  set service broadcast-relay id <n> disable
---
 interface-definitions/bcast-relay.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'interface-definitions/bcast-relay.xml')

diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml
index 0437192fa..fdba554db 100644
--- a/interface-definitions/bcast-relay.xml
+++ b/interface-definitions/bcast-relay.xml
@@ -3,12 +3,18 @@
 <interfaceDefinition>
   <node name="service">
     <children>
-      <node name="broadcast-relay">
+      <node name="broadcast-relay" owner="${vyos_conf_scripts_dir}/bcast_relay.py">
         <properties>
-          <help>UDP Broadcast Relay parameters</help>
+          <help>UDP broadcast relay service</help>
         </properties>
         <children>
-          <tagNode name="id" owner="${vyos_conf_scripts_dir}/bcast_relay.py">
+          <leafNode name="disable">
+            <properties>
+              <help>Globally disable broadcast relay service</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <tagNode name="id">
             <properties>
               <help>Unique ID for each UDP port to forward</help>
               <valueHelp>
@@ -21,6 +27,12 @@
               </constraint>
             </properties>
             <children>
+              <leafNode name="disable">
+                <properties>
+                  <help>Disable broadcast relay service instance</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               <leafNode name="address">
                 <properties>
                   <help>Set source IP of forwarded packets, otherwise original senders address is used</help>
@@ -29,7 +41,7 @@
                     <description>Optional source address for forwarded packets</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="ipv4"/>
+                    <validator name="ipv4-address"/>
                   </constraint>
                 </properties>
               </leafNode>
-- 
cgit v1.2.3


From a0406e87389ad9ff9a045383d50d2bce49179382 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 28 Aug 2018 23:03:10 +0200
Subject: bcast-relay.xml: move priority from tagNode to base node

---
 interface-definitions/bcast-relay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions/bcast-relay.xml')

diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml
index fdba554db..96ce16639 100644
--- a/interface-definitions/bcast-relay.xml
+++ b/interface-definitions/bcast-relay.xml
@@ -6,6 +6,7 @@
       <node name="broadcast-relay" owner="${vyos_conf_scripts_dir}/bcast_relay.py">
         <properties>
           <help>UDP broadcast relay service</help>
+          <priority>990</priority>
         </properties>
         <children>
           <leafNode name="disable">
@@ -21,7 +22,6 @@
                 <format>1-99</format>
                 <description>Numerical ID #</description>
               </valueHelp>
-              <priority>990</priority>
               <constraint>
                 <validator name="numeric" argument="--range 1-99"/>
               </constraint>
-- 
cgit v1.2.3