summaryrefslogtreecommitdiff
path: root/op-mode-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'op-mode-definitions')
-rw-r--r--op-mode-definitions/monitor-bandwidth-test.xml.in48
-rw-r--r--op-mode-definitions/vpn-ipsec.xml.in2
2 files changed, 40 insertions, 10 deletions
diff --git a/op-mode-definitions/monitor-bandwidth-test.xml.in b/op-mode-definitions/monitor-bandwidth-test.xml.in
index 5b36b1da5..965591280 100644
--- a/op-mode-definitions/monitor-bandwidth-test.xml.in
+++ b/op-mode-definitions/monitor-bandwidth-test.xml.in
@@ -7,21 +7,51 @@
<help>Initiate or wait for bandwidth test</help>
</properties>
<children>
- <leafNode name="accept">
+ <node name="accept">
<properties>
<help>Wait for bandwidth test connections (port TCP/5001)</help>
</properties>
<command>/usr/bin/iperf -V -s</command>
- </leafNode>
- <tagNode name="initiate">
+ <children>
+ <leafNode name="tcp">
+ <properties>
+ <help>Wait for bandwidth test connections (port TCP/5001)</help>
+ </properties>
+ <command>/usr/bin/iperf -V -s</command>
+ </leafNode>
+ <leafNode name="udp">
+ <properties>
+ <help>Wait for bandwidth test connections (port UDP/5001)</help>
+ </properties>
+ <command>/usr/bin/iperf -V -s -u</command>
+ </leafNode>
+ </children>
+ </node>
+ <node name="initiate">
<properties>
- <help>Initiate a bandwidth test to specified host (port TCP/5001)</help>
- <completionHelp>
- <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
- </completionHelp>
+ <help>Initiate a bandwidth test to specified host</help>
</properties>
- <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$4"</command>
- </tagNode>
+ <children>
+ <tagNode name="tcp">
+ <properties>
+ <help>Initiate a bandwidth test to specified host (port TCP/5001)</help>
+ <completionHelp>
+ <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5"</command>
+ </tagNode>
+ <tagNode name="udp">
+ <properties>
+ <help>Initiate a bandwidth test to specified host (port UDP/5001)</help>
+ <completionHelp>
+ <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5" "-u"</command>
+ </tagNode>
+ </children>
+ </node>
</children>
</node>
</children>
diff --git a/op-mode-definitions/vpn-ipsec.xml.in b/op-mode-definitions/vpn-ipsec.xml.in
index b836b193f..76f4893c1 100644
--- a/op-mode-definitions/vpn-ipsec.xml.in
+++ b/op-mode-definitions/vpn-ipsec.xml.in
@@ -124,7 +124,7 @@
<children>
<tagNode name="tunnel">
<properties>
- <help>Show debugging information for a peer's tunnel</help>
+ <help>Show debug information for peer tunnel</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/vpn_ipsec.py --action="vpn-debug" --name="$5" --tunnel="$7"</command>
</tagNode>