summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-03-10 11:16:20 -0800
committerStephen Hemminger <shemminger@vyatta.com>2012-03-10 11:16:20 -0800
commit87d5923cbe7099374b7d2d3b0e00acfeb85c501a (patch)
treebb15594c4873b5123241e9c2136fa1506f4f5b8b
parentc63d67637659614fe154fa3067ff991e409f65bf (diff)
downloadvyatta-op-87d5923cbe7099374b7d2d3b0e00acfeb85c501a.tar.gz
vyatta-op-87d5923cbe7099374b7d2d3b0e00acfeb85c501a.zip
ping: fix error handling
Also reindent.
-rwxr-xr-xscripts/vyatta-ping13
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/vyatta-ping b/scripts/vyatta-ping
index ab7768e..fb3b5c3 100755
--- a/scripts/vyatta-ping
+++ b/scripts/vyatta-ping
@@ -7,10 +7,12 @@ use warnings;
use NetAddr::IP;
use feature ":5.10";
-my $ip = new NetAddr::IP $ARGV[0];
-return unless defined $ip;
+my $host = $ARGV[0];
+my $ip = new NetAddr::IP;
+die "Unknown host: $host\n"
+ unless defined($ip);
-given ($ip->version) {
+given ($ip->version()) {
when (4) {
exec { '/bin/ping' } 'ping', @ARGV
or die "Can't exec ping";
@@ -20,9 +22,6 @@ given ($ip->version) {
or die "Can't exec ping6";
}
default {
- die "Unknown address: $ARGV[0]\n";
+ die "Unknown address: $host\n";
}
}
-
-
-