From e74859243042f87c4e3e6fa8e90902641d67b081 Mon Sep 17 00:00:00 2001
From: Andrew Topp <andrewt@telekinetica.net>
Date: Sun, 9 Jun 2024 11:48:21 +1000
Subject: T6456: Convert "monitor traffic" to modern op-mode wrapper

The old "monitor traffic" definition had misaligned arguments under the verbose node
and manually offered the same parameter keyword in multiple positions to emulate
flexible parameters.

I've wrapped tcpdump for op-mode and replicated the "varargs" style from mtr.py/mtr.xml.in
to present a few more parameters in a more flexible manner.

Changes to the Makefile were required for recursive varargs lookup.
---
 op-mode-definitions/traffic-dump.xml.in | 55 +++++----------------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

(limited to 'op-mode-definitions/traffic-dump.xml.in')

diff --git a/op-mode-definitions/traffic-dump.xml.in b/op-mode-definitions/traffic-dump.xml.in
index 76e3ddce5..e86e69736 100644
--- a/op-mode-definitions/traffic-dump.xml.in
+++ b/op-mode-definitions/traffic-dump.xml.in
@@ -8,7 +8,7 @@
         </properties>
         <children>
           <tagNode name="interface">
-            <command>sudo tcpdump -i $4</command>
+            <command>${vyos_op_scripts_dir}/tcpdump.py $4</command>
             <properties>
               <help>Monitor traffic dump from an interface</help>
               <completionHelp>
@@ -16,54 +16,15 @@
               </completionHelp>
             </properties>
             <children>
-              <node name="verbose">
-                <command>sudo tcpdump -vvv -ne -i $4</command>
+              <leafNode name="node.tag">
                 <properties>
-                  <help>Provide more detailed packets for each monitored traffic</help>
+                  <help>Traffic capture options</help>
+                  <completionHelp>
+                    <script>${vyos_op_scripts_dir}/tcpdump.py --get-options-nested "${COMP_WORDS[@]}"</script>
+                  </completionHelp>
                 </properties>
-                <children>
-                  <tagNode name="filter">
-                    <command>sudo tcpdump -vvv -ne -i $4 "${@:6}"</command>
-                    <properties>
-                      <help>Monitor traffic matching filter conditions</help>
-                    </properties>
-                  </tagNode>
-                  <tagNode name="save">
-                    <command>sudo tcpdump -vvv -ne -i $4 -w $6</command>
-                    <properties>
-                      <help>Save traffic dump from an interface to a file</help>
-                    </properties>
-                    <children>
-                      <tagNode name="filter">
-                        <command>sudo tcpdump -vvv -ne -i $4 -w $6 "${@:8}"</command>
-                        <properties>
-                          <help>Save a dump of traffic matching filter conditions to a file</help>
-                        </properties>
-                      </tagNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </node>
-              <tagNode name="filter">
-                <command>sudo tcpdump -n -i $4 "${@:6}"</command>
-                <properties>
-                  <help>Monitor traffic matching filter conditions</help>
-                </properties>
-              </tagNode>
-              <tagNode name="save">
-                <command>sudo tcpdump -n -i $4 -w $6</command>
-                <properties>
-                  <help>Save traffic dump from an interface to a file</help>
-                </properties>
-                <children>
-                  <tagNode name="filter">
-                    <command>sudo tcpdump -n -i $4 -w $6 "${@:8}"</command>
-                    <properties>
-                      <help>Save a dump of traffic matching filter conditions to a file</help>
-                    </properties>
-                  </tagNode>
-                </children>
-              </tagNode>
+                <command>${vyos_op_scripts_dir}/tcpdump.py "${@:4}"</command>
+              </leafNode>
             </children>
           </tagNode>
         </children>
-- 
cgit v1.2.3