From 624ca3e1040631a6aeac8aedf77db33f7db5afc6 Mon Sep 17 00:00:00 2001 From: Devops Date: Mon, 3 Jul 2017 16:49:30 +0100 Subject: [PATCH] Option ip-is-routed --- bin/ovh-api | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/ovh-api b/bin/ovh-api index 6100e8b4..a61e1381 100755 --- a/bin/ovh-api +++ b/bin/ovh-api @@ -59,15 +59,12 @@ ip_move($Opt{'ip-move'}) if $Opt{'ip-move'}; if ($Opt{'ip-routed'}) { my @routed = ip_routed($Opt{'ip-routed'}); print JSON::encode_json(\@routed); - require Sys::Hostname; - my $localhost = Sys::Hostname::hostname(); exit 0; } if ($Opt{'ip-is-routed'}) { my @routed = ip_routed($Opt{'ip-is-routed'}); - require Sys::Hostname; - my $localhost = Sys::Hostname::hostname(); + my $localhost = hostname(); exit ! grep {$_ eq $localhost} @routed; } @@ -83,6 +80,11 @@ exit 0; # Functions # ################################################################################# +sub hostname { + require Sys::Hostname; + return Sys::Hostname::hostname(); +} + sub ips() { return grep defined map { /^\s*inet (?:addr:)?([\d\.]+)/ and $1 ne "127.0.0.1" @@ -127,9 +129,8 @@ sub ip_routed { sub ip_move { my ($ip) = @_; - require Sys::Hostname; - my $localhost = Sys::Hostname::hostname(); + my $localhost = hostname(); my $rec = _query("/ip/$ip") or exit 1; -- 2.47.3