From 2a4f007bc3f384fcd7ca43254f38a4156ab1f8c8 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Wed, 21 Sep 2022 17:46:32 +0000
Subject: T4699: Firewall: Add return action, since jump action was added
 recently

---
 interface-definitions/include/firewall/action.xml.i         | 8 ++++++--
 interface-definitions/include/firewall/default-action.xml.i | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'interface-definitions/include/firewall')

diff --git a/interface-definitions/include/firewall/action.xml.i b/interface-definitions/include/firewall/action.xml.i
index 0738fa503..468340cbb 100644
--- a/interface-definitions/include/firewall/action.xml.i
+++ b/interface-definitions/include/firewall/action.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Rule action</help>
     <completionHelp>
-      <list>accept jump reject drop</list>
+      <list>accept jump reject return drop</list>
     </completionHelp>
     <valueHelp>
       <format>accept</format>
@@ -17,12 +17,16 @@
       <format>reject</format>
       <description>Reject matching entries</description>
     </valueHelp>
+    <valueHelp>
+      <format>return</format>
+      <description>Return from the current chain and continue at the next rule of the last chain</description>
+    </valueHelp>
     <valueHelp>
       <format>drop</format>
       <description>Drop matching entries</description>
     </valueHelp>
     <constraint>
-      <regex>(accept|jump|reject|drop)</regex>
+      <regex>(accept|jump|reject|return|drop)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/default-action.xml.i b/interface-definitions/include/firewall/default-action.xml.i
index 5107768d3..80efaf335 100644
--- a/interface-definitions/include/firewall/default-action.xml.i
+++ b/interface-definitions/include/firewall/default-action.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Default-action for rule-set</help>
     <completionHelp>
-      <list>drop jump reject accept</list>
+      <list>drop jump reject return accept</list>
     </completionHelp>
     <valueHelp>
       <format>drop</format>
@@ -17,12 +17,16 @@
       <format>reject</format>
       <description>Drop and notify source if no prior rules are hit</description>
     </valueHelp>
+    <valueHelp>
+      <format>return</format>
+      <description>Return from the current chain and continue at the next rule of the last chain</description>
+    </valueHelp>
     <valueHelp>
       <format>accept</format>
       <description>Accept if no prior rules are hit</description>
     </valueHelp>
     <constraint>
-      <regex>(drop|jump|reject|accept)</regex>
+      <regex>(drop|jump|reject|return|accept)</regex>
     </constraint>
   </properties>
   <defaultValue>drop</defaultValue>
-- 
cgit v1.2.3