diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-08-17 19:36:11 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-27 17:11:28 -0500 |
| commit | 1f8755e7fa091ae705eda151882424d4e95e1832 (patch) | |
| tree | 9ef2a6ad90123d9e1ffda62b9eed1944a291a5f1 /templates | |
| parent | 909267c0ba0bf6c92e14150313e3e3f6958753ea (diff) | |
| download | vyatta-op-1f8755e7fa091ae705eda151882424d4e95e1832.tar.gz vyatta-op-1f8755e7fa091ae705eda151882424d4e95e1832.zip | |
Initial traceroute rework checkin
(cherry picked from commit ce64904840bea3e716a7de3eca2618e63bcd87d1)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/traceroute/ipv4/node.def | 4 | ||||
| -rw-r--r-- | templates/traceroute/ipv4/node.tag/node.def | 25 | ||||
| -rw-r--r-- | templates/traceroute/ipv6/node.def (renamed from templates/traceroute6/node.def) | 0 | ||||
| -rw-r--r-- | templates/traceroute/ipv6/node.tag/node.def (renamed from templates/traceroute6/node.tag/node.def) | 12 | ||||
| -rw-r--r-- | templates/traceroute/node.def | 2 | ||||
| -rw-r--r-- | templates/traceroute/node.tag/node.def | 23 |
6 files changed, 39 insertions, 27 deletions
diff --git a/templates/traceroute/ipv4/node.def b/templates/traceroute/ipv4/node.def new file mode 100644 index 0000000..2f618b1 --- /dev/null +++ b/templates/traceroute/ipv4/node.def @@ -0,0 +1,4 @@ +# +# Operational mode template for the "traceroute" command +# +help: Track network path to <hostname|IPv4 address> diff --git a/templates/traceroute/ipv4/node.tag/node.def b/templates/traceroute/ipv4/node.tag/node.def new file mode 100644 index 0000000..a37ae5b --- /dev/null +++ b/templates/traceroute/ipv4/node.tag/node.def @@ -0,0 +1,25 @@ +# +# Operational mode template for the "traceroute" command +# + +help: Track network path to specified <hostname|IPv4 address> +allowed: echo -n '<hostname> <x:x:x:x>' + +run: + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $3 + then + /usr/bin/traceroute $3 + echo + else + if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver + then + if /usr/bin/host $3 &> /dev/null + then + /usr/bin/traceroute $3 + else + echo "Invalid IPv4 address or host name '$3'" + fi + else + echo "Either enter a valid IPv4 address or configure Domain Name Server to resolve host names" + fi + fi diff --git a/templates/traceroute6/node.def b/templates/traceroute/ipv6/node.def index 1075c44..1075c44 100644 --- a/templates/traceroute6/node.def +++ b/templates/traceroute/ipv6/node.def diff --git a/templates/traceroute6/node.tag/node.def b/templates/traceroute/ipv6/node.tag/node.def index 59d5367..b746c3e 100644 --- a/templates/traceroute6/node.tag/node.def +++ b/templates/traceroute/ipv6/node.tag/node.def @@ -3,21 +3,21 @@ # help: Track network path to specified <hostname|IPv6 address> -allowed: echo -n '<hostname> <x:x:x:x:x>' +allowed: echo -n '<hostname> <h:h:h:h:h:h:h:h>' run: - if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $2 + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $3 then - /usr/bin/traceroute6 $2 + /usr/bin/traceroute6 $3 echo else if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver then - if /usr/bin/host $2 &> /dev/null + if /usr/bin/host $3 &> /dev/null then - /usr/bin/traceroute6 $2 + /usr/bin/traceroute6 $3 else - echo "Invalid IPv6 address or host name '$2'" + echo "Invalid IPv6 address or host name '$3'" fi else echo "Either enter a valid IPv6 address or configure Domain Name Server to resolve host names" diff --git a/templates/traceroute/node.def b/templates/traceroute/node.def index 2f618b1..28e695c 100644 --- a/templates/traceroute/node.def +++ b/templates/traceroute/node.def @@ -1,4 +1,4 @@ # # Operational mode template for the "traceroute" command # -help: Track network path to <hostname|IPv4 address> +help: Track network path to node diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def index 7309798..7b90221 100644 --- a/templates/traceroute/node.tag/node.def +++ b/templates/traceroute/node.tag/node.def @@ -2,24 +2,7 @@ # Operational mode template for the "traceroute" command # -help: Track network path to specified <hostname|IPv4 address> -allowed: echo -n '<hostname> <x.x.x.x>' +help: Track network path to specified node +allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>' -run: - if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $2 - then - /usr/bin/traceroute $2 - echo - else - if cat /etc/resolv.conf 2> /dev/null | 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 +run: /opt/vyatta/bin/vyatta-traceroute $2 |