X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=clients%2Fciscong.pl;h=068ff308e9c5ad7f3730f8c8595b8a5abd30a4e4;hb=0ad6c333401520caccb37749f6f1ba22a789e83e;hp=76ec4759102a2d9556f1352ec28bc68ec8230d46;hpb=cdd60722550e4c3fc22faf1d00b0214f0d08bce8;p=nms

diff --git a/clients/ciscong.pl b/clients/ciscong.pl
index 76ec475..068ff30 100644
--- a/clients/ciscong.pl
+++ b/clients/ciscong.pl
@@ -75,7 +75,7 @@ sub do_distro {
 #			Prompt => '/[^\s\(]+(\([^\(]\)){0,1}[#>]/');
 	if (!defined($ios)) {
 		print "Could not connect to $dip";
-		return;
+		return 0;
 	}
 	$ios->login($nms::config::ios_user, $nms::config::ios_pass);
 	$ios->enable;
@@ -94,7 +94,7 @@ sub do_distro {
 
 	if (ios_getroute($ios, "192.168.1.0") == 1) {
 		print "Already routed up 192.168.1.0/24\n" ;
-		return;
+		return 0;
 	}
 
 	my $zyxeloldip = "192.168.1.1";
@@ -111,7 +111,7 @@ sub do_distro {
 			print "Waiting for zyxel on $dip:$vlan timed out, wanted to set ip: $newip\n";
 			print LOG "Could not connect to $switchname\n";
 			stop_vlan($ios, $vlan);
-			return;
+			return 0;
 		}
 		last if $p->ping($zyxeloldip);
 		print "pinging...\n";
@@ -130,6 +130,7 @@ sub do_distro {
 
 	$ios->close();
 
+	return 1;
 }
 
 ## Collect switch ips
@@ -204,7 +205,11 @@ sub verify_run {
 		while (1) {
 			if ($counter > 4) {
 				print "No answer from $dip:$vlan $ip, trying to route it up\n";
-				do_distro($dip, $ip, $vlan, $switch);
+				my $ret = do_distro($dip, $ip, $vlan, $switch);
+				if ($ret == 0) {
+					# No answer from zyxel
+					last;
+				}
 				my $pid = fork();
 				if ($pid == 0) {
 					sleep 100;