From 909152a69e0844ad0cdd2b05467cd7fe379a5347 Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Mon, 10 Aug 2020 21:40:57 +0800
Subject: tcptraceroute: T2723: Fix the problem that tcptraceroute6 cannot be
 executed

---
 debian/control                     |  3 ++-
 op-mode-definitions/traceroute.xml | 12 ++++++------
 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">
-- 
cgit v1.2.3


From b39c21af1de08f87cc5c9131ae4f9afc4e9759a5 Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Mon, 10 Aug 2020 21:41:43 +0800
Subject: tcptraceroute: T2723: Support VRF

---
 op-mode-definitions/traceroute.xml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index b562eb2e6..640f0b90c 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -98,6 +98,24 @@
               </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>
+                <children>
+                  <tagNode name="port">
+                    <properties>
+                      <help>Perform operations on TCP ports</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 +125,24 @@
               </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>
+                <children>
+                  <tagNode name="port">
+                    <properties>
+                      <help>Perform operations on TCP ports</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>
-- 
cgit v1.2.3


From 0393bbebeda9d8a610accf15377a3487b4fc1ddc Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Mon, 10 Aug 2020 21:45:58 +0800
Subject: tcptraceroute: T2723: Improve command line options, support execution
 without port

Because the ports of tcptraceroute and tcptraceroute6
do not need to be specified in this feature,
 modify the command line syntax
---
 op-mode-definitions/traceroute.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index 640f0b90c..10ee3c07e 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -30,6 +30,7 @@
             <properties>
               <help>Route tracing and port detection using TCP</help>
             </properties>
+            <command>sudo /usr/bin/tcptraceroute "$3" </command>
             <children>
               <tagNode name="port">
                 <properties>
@@ -57,6 +58,7 @@
             <properties>
               <help>Use TCP/IPv6 packets to perform a traceroute</help>
             </properties>
+            <command>sudo /usr/bin/tcptraceroute6 "$3" </command>
             <children>
               <tagNode name="port">
                 <properties>
@@ -103,6 +105,7 @@
                 <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>
@@ -130,6 +133,7 @@
                 <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>
-- 
cgit v1.2.3


From 399bc459b94d4b918364d1e6b168d1842c8445b5 Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Tue, 11 Aug 2020 11:45:42 +0800
Subject: tcptraceroute: T2723: Modify port description

In response to #522 request, modify `Perform operations
on TCP ports` to `TCP port to connect to for path tracing`
---
 op-mode-definitions/traceroute.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index 10ee3c07e..6a44fc25b 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -34,7 +34,7 @@
             <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>
@@ -62,7 +62,7 @@
             <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>
@@ -109,7 +109,7 @@
                 <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>
@@ -137,7 +137,7 @@
                 <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>
-- 
cgit v1.2.3