summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack9603301 <jack9603301@163.com>2020-08-10 21:40:57 +0800
committerjack9603301 <jack9603301@163.com>2020-08-10 21:40:57 +0800
commit909152a69e0844ad0cdd2b05467cd7fe379a5347 (patch)
treed82e277bdf57be2fe28a6588032e04a215e99e80
parent846e306700af191d22dc874992bbf5f04d2799c4 (diff)
downloadvyos-1x-909152a69e0844ad0cdd2b05467cd7fe379a5347.tar.gz
vyos-1x-909152a69e0844ad0cdd2b05467cd7fe379a5347.zip
tcptraceroute: T2723: Fix the problem that tcptraceroute6 cannot be executed
-rw-r--r--debian/control3
-rw-r--r--op-mode-definitions/traceroute.xml12
2 files changed, 8 insertions, 7 deletions
diff --git a/debian/control b/debian/control
index 3a441b47b..34ba4be8e 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,8 @@ Depends: python3,
conntrack,
libatomic1,
fastnetmon,
- libndp-tools
+ libndp-tools,
+ tcptraceroute
Description: VyOS configuration scripts and data
VyOS configuration scripts, interface definitions, and everything
diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index efbaaeb2f..b562eb2e6 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -26,7 +26,7 @@
</properties>
<command>/usr/bin/traceroute -4 "$3"</command>
<children>
- <tagNode name="tcp">
+ <node name="tcp">
<properties>
<help>Route tracing and port detection using TCP</help>
</properties>
@@ -38,10 +38,10 @@
<list>0-65535</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/tcptraceroute "$3" $6</command>
+ <command>sudo /usr/bin/tcptraceroute "$3" $6</command>
</tagNode>
</children>
- </tagNode>
+ </node>
</children>
</tagNode>
<tagNode name="ipv6">
@@ -53,7 +53,7 @@
</properties>
<command>/usr/bin/traceroute -6 "$3"</command>
<children>
- <tagNode name="tcp">
+ <node name="tcp">
<properties>
<help>Use TCP/IPv6 packets to perform a traceroute</help>
</properties>
@@ -65,10 +65,10 @@
<list>0-65535</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/tcptraceroute6 "$3" $6</command>
+ <command>sudo /usr/bin/tcptraceroute6 "$3" $6</command>
</tagNode>
</children>
- </tagNode>
+ </node>
</children>
</tagNode>
<tagNode name="vrf">