diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-06-13 16:51:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 16:51:59 +0200 |
| commit | e1916a16627f34cd25aa8768446a0758de281ba6 (patch) | |
| tree | 25ecf929a4f5f720501c67d2ec38287ebfc081b6 /op-mode-definitions | |
| parent | c4269a9ddb0342dee78175f557e331df518d55d3 (diff) | |
| parent | e74859243042f87c4e3e6fa8e90902641d67b081 (diff) | |
| download | vyos-1x-e1916a16627f34cd25aa8768446a0758de281ba6.tar.gz vyos-1x-e1916a16627f34cd25aa8768446a0758de281ba6.zip | |
Merge pull request #3601 from talmakion/bugfix/T6456
T6456: Convert "monitor traffic" to modern op-mode wrapper
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/traffic-dump.xml.in | 55 |
1 files changed, 8 insertions, 47 deletions
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> |