From 1772280e0ca4db5b3cc4202f92cc49b49d25d66f Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Thu, 19 Jun 2008 07:00:53 +0000 Subject: deleting op-command 'clear dhcp client process' as its handling in the script vyatta-interfaces.pl has been removed. it was used to restart dhcp client daemon but now we're using separate daemons for separate interfaces. this will be replaces by op-commands for: 'dhcp release lease interface <>' and 'dhcp renew lease interface <>' --- templates/clear/dhcp/client/node.def | 1 - templates/clear/dhcp/client/process/node.def | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 templates/clear/dhcp/client/node.def delete mode 100644 templates/clear/dhcp/client/process/node.def (limited to 'templates') diff --git a/templates/clear/dhcp/client/node.def b/templates/clear/dhcp/client/node.def deleted file mode 100644 index 1c658f0..0000000 --- a/templates/clear/dhcp/client/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Clear DHCP client information diff --git a/templates/clear/dhcp/client/process/node.def b/templates/clear/dhcp/client/process/node.def deleted file mode 100644 index c83dace..0000000 --- a/templates/clear/dhcp/client/process/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Restart the DHCP client process -run: sudo ${vyatta_bindir}/sudo-users/vyatta-interfaces.pl --restart-dhclient -- cgit v1.2.3 From 831845a659ffe6d054d09d19364021519f211a23 Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Fri, 20 Jun 2008 22:58:12 +0000 Subject: Fix bug 3059 Operator Level commands for DHCP client implemented op-mode commands for DHCP client: 'release dhcp interface <>' 'renew dhcp interface <>' --- templates/release/dhcp/interface/node.def | 1 + templates/release/dhcp/interface/node.tag/node.def | 4 ++++ templates/release/dhcp/node.def | 1 + templates/release/node.def | 1 + templates/renew/dhcp/interface/node.def | 1 + templates/renew/dhcp/interface/node.tag/node.def | 5 +++++ templates/renew/dhcp/node.def | 1 + templates/renew/node.def | 1 + 8 files changed, 15 insertions(+) create mode 100644 templates/release/dhcp/interface/node.def create mode 100644 templates/release/dhcp/interface/node.tag/node.def create mode 100644 templates/release/dhcp/node.def create mode 100644 templates/release/node.def create mode 100644 templates/renew/dhcp/interface/node.def create mode 100644 templates/renew/dhcp/interface/node.tag/node.def create mode 100644 templates/renew/dhcp/node.def create mode 100644 templates/renew/node.def (limited to 'templates') diff --git a/templates/release/dhcp/interface/node.def b/templates/release/dhcp/interface/node.def new file mode 100644 index 0000000..e65989f --- /dev/null +++ b/templates/release/dhcp/interface/node.def @@ -0,0 +1 @@ +help: Release DHCP client lease for specified interface diff --git a/templates/release/dhcp/interface/node.tag/node.def b/templates/release/dhcp/interface/node.tag/node.def new file mode 100644 index 0000000..8f5fb61 --- /dev/null +++ b/templates/release/dhcp/interface/node.tag/node.def @@ -0,0 +1,4 @@ +help: Release DHCP IP address lease for specified interface +run: + IFNAME=${4} + /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-release --dev $IFNAME diff --git a/templates/release/dhcp/node.def b/templates/release/dhcp/node.def new file mode 100644 index 0000000..03365d7 --- /dev/null +++ b/templates/release/dhcp/node.def @@ -0,0 +1 @@ +help: Release DHCP client lease diff --git a/templates/release/node.def b/templates/release/node.def new file mode 100644 index 0000000..36c8901 --- /dev/null +++ b/templates/release/node.def @@ -0,0 +1 @@ +help: Release specified variable diff --git a/templates/renew/dhcp/interface/node.def b/templates/renew/dhcp/interface/node.def new file mode 100644 index 0000000..87993a9 --- /dev/null +++ b/templates/renew/dhcp/interface/node.def @@ -0,0 +1 @@ +help: Renew DHCP client lease for specified interface diff --git a/templates/renew/dhcp/interface/node.tag/node.def b/templates/renew/dhcp/interface/node.tag/node.def new file mode 100644 index 0000000..460e2f6 --- /dev/null +++ b/templates/renew/dhcp/interface/node.tag/node.def @@ -0,0 +1,5 @@ +help: Renew DHCP IP address lease for specified interface +run: + IFNAME=${4} + /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-renew --dev $IFNAME + diff --git a/templates/renew/dhcp/node.def b/templates/renew/dhcp/node.def new file mode 100644 index 0000000..78b64fb --- /dev/null +++ b/templates/renew/dhcp/node.def @@ -0,0 +1 @@ +help: Renew DHCP client lease diff --git a/templates/renew/node.def b/templates/renew/node.def new file mode 100644 index 0000000..9b4c9d4 --- /dev/null +++ b/templates/renew/node.def @@ -0,0 +1 @@ +help: Renew specified variable -- cgit v1.2.3 From a0aacbcb65bae15ddcf9d2af2fdea4da84210592 Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Sat, 21 Jun 2008 01:21:34 +0000 Subject: added code for allowed values for op-mode dhcp release/renew lease commands --- templates/release/dhcp/interface/node.tag/node.def | 5 +++++ templates/renew/dhcp/interface/node.tag/node.def | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'templates') diff --git a/templates/release/dhcp/interface/node.tag/node.def b/templates/release/dhcp/interface/node.tag/node.def index 8f5fb61..a39a308 100644 --- a/templates/release/dhcp/interface/node.tag/node.def +++ b/templates/release/dhcp/interface/node.tag/node.def @@ -1,4 +1,9 @@ help: Release DHCP IP address lease for specified interface +allowed: + local -a array ; + array=( /var/lib/dhcp3/eth* ) ; + echo -n ${array[@]##*/} + run: IFNAME=${4} /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-release --dev $IFNAME diff --git a/templates/renew/dhcp/interface/node.tag/node.def b/templates/renew/dhcp/interface/node.tag/node.def index 460e2f6..3bc5993 100644 --- a/templates/renew/dhcp/interface/node.tag/node.def +++ b/templates/renew/dhcp/interface/node.tag/node.def @@ -1,4 +1,9 @@ help: Renew DHCP IP address lease for specified interface +allowed: + local -a array ; + array=( /var/lib/dhcp3/eth* ) ; + echo -n ${array[@]##*/} + run: IFNAME=${4} /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-renew --dev $IFNAME -- cgit v1.2.3 From 9889f0d29051c1b713a94457754eb50232ff8bad Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Sat, 21 Jun 2008 21:57:55 +0000 Subject: Fix Bug 3378 user "vyatta" got "permission denied" after executing "renew dhcp ..." and/or "release dhcp ..." call script with sudo --- templates/release/dhcp/interface/node.tag/node.def | 2 +- templates/renew/dhcp/interface/node.tag/node.def | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/release/dhcp/interface/node.tag/node.def b/templates/release/dhcp/interface/node.tag/node.def index a39a308..2fadea2 100644 --- a/templates/release/dhcp/interface/node.tag/node.def +++ b/templates/release/dhcp/interface/node.tag/node.def @@ -6,4 +6,4 @@ allowed: run: IFNAME=${4} - /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-release --dev $IFNAME + sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-release" --dev "$IFNAME" diff --git a/templates/renew/dhcp/interface/node.tag/node.def b/templates/renew/dhcp/interface/node.tag/node.def index 3bc5993..9952a49 100644 --- a/templates/renew/dhcp/interface/node.tag/node.def +++ b/templates/renew/dhcp/interface/node.tag/node.def @@ -6,5 +6,4 @@ allowed: run: IFNAME=${4} - /opt/vyatta/sbin/vyatta-interfaces.pl --op-command dhcp-renew --dev $IFNAME - + sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-renew" --dev "$IFNAME" -- cgit v1.2.3 From 1279d97cb4fc07c542a15a334fa19df03d20204b Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Sun, 22 Jun 2008 04:23:08 +0000 Subject: Bug 3385 incomplete command 'run' in configure mode produces backend error to user having an empty node.def file solves this --- templates/node.def | 1 + 1 file changed, 1 insertion(+) create mode 100644 templates/node.def (limited to 'templates') diff --git a/templates/node.def b/templates/node.def new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/templates/node.def @@ -0,0 +1 @@ + -- cgit v1.2.3 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 --- scripts/vyatta-tshark-interface-port.pl | 36 ++++++++++++++++++++-- .../interfaces/bridge/node.tag/capture/node.def | 2 ++ .../bridge/node.tag/capture/not/node.def | 1 + .../bridge/node.tag/capture/not/port/node.def | 1 + .../node.tag/capture/not/port/node.tag/node.def | 4 +++ .../bridge/node.tag/capture/port/node.def | 1 + .../bridge/node.tag/capture/port/node.tag/node.def | 3 ++ .../node.tag/vif/node.tag/capture/node.def | 2 ++ .../node.tag/vif/node.tag/capture/not/node.def | 1 + .../vif/node.tag/capture/not/port/node.def | 1 + .../node.tag/capture/not/port/node.tag/node.def | 3 ++ .../node.tag/vif/node.tag/capture/port/node.def | 1 + .../vif/node.tag/capture/port/node.tag/node.def | 3 ++ .../interfaces/loopback/node.tag/capture/node.def | 2 ++ .../loopback/node.tag/capture/not/node.def | 1 + .../loopback/node.tag/capture/not/port/node.def | 1 + .../node.tag/capture/not/port/node.tag/node.def | 3 ++ .../loopback/node.tag/capture/port/node.def | 1 + .../node.tag/capture/port/node.tag/node.def | 3 ++ 19 files changed, 67 insertions(+), 3 deletions(-) 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') diff --git a/scripts/vyatta-tshark-interface-port.pl b/scripts/vyatta-tshark-interface-port.pl index 4eff322..aa750e5 100644 --- a/scripts/vyatta-tshark-interface-port.pl +++ b/scripts/vyatta-tshark-interface-port.pl @@ -28,12 +28,39 @@ use lib "/opt/vyatta/share/perl5/"; use strict; use warnings; +sub check_if_interface_is_tsharkable { + my $interface = shift; + + my @grep_tshark_interfaces = `sudo /usr/bin/tshark -D | grep $interface`; + my $any_interface; + + for my $count (0 .. $#grep_tshark_interfaces) { + my @temp = split(/ /,$grep_tshark_interfaces[$count]); + chomp $temp[1]; + $grep_tshark_interfaces[$count] = $temp[1]; + } + + my $exact_match = 0; + for my $count (0 .. $#grep_tshark_interfaces) { + if ($grep_tshark_interfaces[$count] eq $interface) { + $exact_match = 1; + $any_interface = $grep_tshark_interfaces[$count]; + } + } + if ($exact_match == 0 || $any_interface eq 'any') { + print "Unable to capture traffic on $interface\n"; + exit 1; + } +} + # # main # my $intf = $ARGV[0]; +check_if_interface_is_tsharkable($intf); + if ($#ARGV > 0){ my $port = $ARGV[1]; my $not_port = $ARGV[2]; @@ -43,9 +70,11 @@ if ($#ARGV > 0){ } else { if (($port > 0) and ($port < 65536)){ if ($not_port == 0){ - exec "sudo /usr/bin/tshark -n -i $intf port $port"; + print "Capturing traffic on $intf port $port ...\n"; + exec "sudo /usr/bin/tshark -n -i $intf port $port 2> /dev/null"; } else { - exec "sudo /usr/bin/tshark -n -i $intf not port $port"; + print "Capturing traffic on $intf excluding port $port ...\n"; + exec "sudo /usr/bin/tshark -n -i $intf not port $port 2> /dev/null"; } } else { print "Invalid port number. Allowed values: <1-65535>\n"; @@ -54,7 +83,8 @@ if ($#ARGV > 0){ } } else { - exec "sudo /usr/bin/tshark -n -i $intf"; + print "Capturing traffic on $intf ...\n"; + exec "sudo /usr/bin/tshark -n -i $intf 2> /dev/null"; } exit 0; 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 From faf87e1a036da715dabba36d119c0ce3a93c7a9e Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Mon, 23 Jun 2008 09:38:45 +0000 Subject: Fix Bug 1059 Feature Request: integrate 'tcpdump' and 'tethereal' into Vyatta CLI add op-mode command for tsharking tunnel interfaces --- templates/show/interfaces/tunnel/node.tag/capture/node.def | 2 ++ templates/show/interfaces/tunnel/node.tag/capture/not/node.def | 1 + templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def | 1 + .../show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def | 3 +++ templates/show/interfaces/tunnel/node.tag/capture/port/node.def | 1 + .../show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def | 3 +++ 6 files changed, 11 insertions(+) create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/node.def create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/not/node.def create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/port/node.def create mode 100644 templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def (limited to 'templates') diff --git a/templates/show/interfaces/tunnel/node.tag/capture/node.def b/templates/show/interfaces/tunnel/node.tag/capture/node.def new file mode 100644 index 0000000..b196a35 --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/node.def @@ -0,0 +1,2 @@ +help: Show captured traffic on specified tunnel interface +run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def new file mode 100644 index 0000000..c957f71 --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def @@ -0,0 +1 @@ +help: Show captured traffic excluding the specified tunnel interface port diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def new file mode 100644 index 0000000..c957f71 --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def @@ -0,0 +1 @@ +help: Show captured traffic excluding the specified tunnel interface port diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def new file mode 100644 index 0000000..b5c87c9 --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def @@ -0,0 +1,3 @@ +help: Show captured traffic excluding the specified tunnel 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/tunnel/node.tag/capture/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def new file mode 100644 index 0000000..ed3b544 --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def @@ -0,0 +1 @@ +help: Show captured traffic on specified tunnel interface port diff --git a/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def new file mode 100644 index 0000000..d1f01df --- /dev/null +++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def @@ -0,0 +1,3 @@ +help: Show captured traffic on specified tunnel interface port +run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0 +allowed: echo -n '<1-65535>' -- cgit v1.2.3 From 4a9dadf356a83ee0270d3848c506d1ca969d2565 Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Mon, 23 Jun 2008 17:56:44 +0000 Subject: Fix Bug 2871 Internal errors reported with traceroute use host command to resolve only if input is not a valid IP address also, if name server not configured, prompt user and ask to only enter valid IPv4 address --- templates/traceroute/node.tag/node.def | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def index 55acbb7..83a3f31 100644 --- a/templates/traceroute/node.tag/node.def +++ b/templates/traceroute/node.tag/node.def @@ -6,9 +6,21 @@ help: Track network path to specified <hostname|IPv4 address> allowed: vyatta-allowed-hosts -run: if /usr/bin/host $2 &>/dev/null - then - /usr/bin/traceroute $2 - else - echo Cannot identify $2 +run: + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $2 + then + /usr/bin/traceroute $2 + echo + else + if cat /etc/resolv.conf | grep -q nameserver + then + if /usr/bin/host $2 &> /dev/null + then + /usr/bin/traceroute $2 + else + echo "Invalid IP address or host name '$2'" + fi + else + echo "Either enter a valid IPv4 address or configure Domain Name Server to resolve host names" + fi fi -- cgit v1.2.3