summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-16 18:22:39 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-16 18:22:39 +0200
commit57aad3a59f9f50d44702cca96a8b6069256caf5e (patch)
tree391aa55e5eef03ef27df7c0aa5811996120bc9bc
parent888163e95c89201ee28c0745508e1ba50c444164 (diff)
parent399bc459b94d4b918364d1e6b168d1842c8445b5 (diff)
downloadvyos-1x-57aad3a59f9f50d44702cca96a8b6069256caf5e.tar.gz
vyos-1x-57aad3a59f9f50d44702cca96a8b6069256caf5e.zip
Merge branch 'T2723' of https://github.com/jack9603301/vyos-1x into current
* 'T2723' of https://github.com/jack9603301/vyos-1x: tcptraceroute: T2723: Modify port description tcptraceroute: T2723: Improve command line options, support execution without port tcptraceroute: T2723: Support VRF tcptraceroute: T2723: Fix the problem that tcptraceroute6 cannot be executed
-rw-r--r--debian/control3
-rw-r--r--op-mode-definitions/traceroute.xml56
2 files changed, 50 insertions, 9 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..6a44fc25b 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -26,22 +26,23 @@
</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>
+ <command>sudo /usr/bin/tcptraceroute "$3" </command>
<children>
<tagNode name="port">
<properties>
- <help>Perform operations on TCP ports</help>
+ <help>TCP port to connect to for path tracing</help>
<completionHelp>
<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,22 +54,23 @@
</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>
+ <command>sudo /usr/bin/tcptraceroute6 "$3" </command>
<children>
<tagNode name="port">
<properties>
- <help>Perform operations on TCP ports</help>
+ <help>TCP port to connect to for path tracing</help>
<completionHelp>
<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">
@@ -98,6 +100,25 @@
</completionHelp>
</properties>
<command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -4 "$5"</command>
+ <children>
+ <node name="tcp">
+ <properties>
+ <help>Route tracing and port detection using TCP</help>
+ </properties>
+ <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute "$5" </command>
+ <children>
+ <tagNode name="port">
+ <properties>
+ <help>TCP port to connect to for path tracing</help>
+ <completionHelp>
+ <list>0-65535</list>
+ </completionHelp>
+ </properties>
+ <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute "$5" $8</command>
+ </tagNode>
+ </children>
+ </node>
+ </children>
</tagNode>
<tagNode name="ipv6">
<properties>
@@ -107,6 +128,25 @@
</completionHelp>
</properties>
<command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -6 "$5"</command>
+ <children>
+ <node name="tcp">
+ <properties>
+ <help>Use TCP/IPv6 packets to perform a traceroute</help>
+ </properties>
+ <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" </command>
+ <children>
+ <tagNode name="port">
+ <properties>
+ <help>TCP port to connect to for path tracing</help>
+ <completionHelp>
+ <list>0-65535</list>
+ </completionHelp>
+ </properties>
+ <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" $8</command>
+ </tagNode>
+ </children>
+ </node>
+ </children>
</tagNode>
</children>
</tagNode>