From e29735e051da7520869b91a4324b9695d9656cfc Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Sun, 22 Jun 2008 18:21:56 +0000
Subject: Fix Bug 1059 Feature Request: integrate 'tcpdump' and 'tethereal'
 into Vyatta CLI added operational mode traffic capture for bridge, ethernet
 vifs and loopback interfaces

Also, added code to validate the the user input for interface to be tsharked
---
 templates/show/interfaces/bridge/node.tag/capture/node.def            | 2 ++
 templates/show/interfaces/bridge/node.tag/capture/not/node.def        | 1 +
 templates/show/interfaces/bridge/node.tag/capture/not/port/node.def   | 1 +
 .../interfaces/bridge/node.tag/capture/not/port/node.tag/node.def     | 4 ++++
 templates/show/interfaces/bridge/node.tag/capture/port/node.def       | 1 +
 .../show/interfaces/bridge/node.tag/capture/port/node.tag/node.def    | 3 +++
 .../show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def   | 2 ++
 .../interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def    | 1 +
 .../ethernet/node.tag/vif/node.tag/capture/not/port/node.def          | 1 +
 .../ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def | 3 +++
 .../interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def   | 1 +
 .../ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def     | 3 +++
 templates/show/interfaces/loopback/node.tag/capture/node.def          | 2 ++
 templates/show/interfaces/loopback/node.tag/capture/not/node.def      | 1 +
 templates/show/interfaces/loopback/node.tag/capture/not/port/node.def | 1 +
 .../interfaces/loopback/node.tag/capture/not/port/node.tag/node.def   | 3 +++
 templates/show/interfaces/loopback/node.tag/capture/port/node.def     | 1 +
 .../show/interfaces/loopback/node.tag/capture/port/node.tag/node.def  | 3 +++
 18 files changed, 34 insertions(+)
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/node.def
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/not/node.def
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/port/node.def
 create mode 100644 templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
 create mode 100644 templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/not/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/port/node.def
 create mode 100644 templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def

(limited to 'templates/show/interfaces')

diff --git a/templates/show/interfaces/bridge/node.tag/capture/node.def b/templates/show/interfaces/bridge/node.tag/capture/node.def
new file mode 100644
index 0000000..ef86b9c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified bridge interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/node.def
new file mode 100644
index 0000000..ecae454
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..ecae454
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..271106c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Show captured traffic excluding the specified bridge interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
+
diff --git a/templates/show/interfaces/bridge/node.tag/capture/port/node.def b/templates/show/interfaces/bridge/node.tag/capture/port/node.def
new file mode 100644
index 0000000..43d1b9c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..7ad54b7
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified bridge interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
new file mode 100644
index 0000000..190fd2f
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified ethernet virtual interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6"
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
new file mode 100644
index 0000000..7328773
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..7328773
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..258c6dc
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding the specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "${10}" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
new file mode 100644
index 0000000..d61d229
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..4090508
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified ethernet virtual interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "$9" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/loopback/node.tag/capture/node.def b/templates/show/interfaces/loopback/node.tag/capture/node.def
new file mode 100644
index 0000000..231ea09
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on loopback interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/node.def
new file mode 100644
index 0000000..b5bd2e6
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..b5bd2e6
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..b8d8ff2
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding loopback interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/loopback/node.tag/capture/port/node.def b/templates/show/interfaces/loopback/node.tag/capture/port/node.def
new file mode 100644
index 0000000..e46cf42
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..f1aedc4
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
-- 
cgit v1.2.3