--- mdap-server.pl	2007/04/23 19:06:18	19
+++ mdap-server.pl	2007/04/23 19:40:57	20
@@ -103,20 +103,38 @@
 	}
 }
 
-my $ant_passwd_try;
+my $ant_passwd;
 
 sub ant_credentials {
 	my $ant = shift || die "no ant?";
-	my $i = $ant_passwd_try->{$ant} || 0;
+	my $i = $ant_passwd->{$ant} || 0;
 	my ($user_id,$user_pwd) = split(/\t/, $try_accounts[$i]);
 	#warn "ant $ant as [$i] $user_id / $user_pwd\n";
 	return ($user_id,$user_pwd);
 }
 
+my $ant_password_protected;
+
 sub ant_another_passwd {
 	my $ant = shift || die "no ant?";
-	$ant_passwd_try->{$ant}++;
-	$ant_passwd_try->{$ant} = 0 if ( $ant_passwd_try->{$ant} > $#try_accounts );
+	return if ( $ant_password_protected->{$ant} );
+
+	$ant_passwd->{$ant}++;
+
+	if ( $ant_passwd->{$ant} > $#try_accounts ) {
+		print "!! ant $ant password protected\n";
+		$ant_password_protected->{$ant}++;
+		return 0;
+	}
+	return 1;
+}
+
+my $once;
+
+sub once {
+	my $m = join(" ", @_);
+	$once->{$m}++;
+	print $m if ($once->{$m} == 1);
 }
 
 local $SIG{ALRM} = sub {
@@ -154,12 +172,14 @@
 		my ($user_id,$user_pwd) = ant_credentials( $ant );
 
 		if ($type eq 'REPLY-ANT-SEARCH') {
-			mdap_send("INFO MDAP/$mdap_ver\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
+			mdap_send("INFO MDAP/$mdap_ver\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n") unless ( $ant_password_protected->{$ant} );
 		} elsif ($type eq 'REPLY-INFO') {
 
 			if ($h->{'SEQ-NR'} < 0) {
-				warn "!! password protected ant $ant, skipping\n";
-				ant_another_passwd( $ant );
+				if ( ant_another_passwd( $ant ) ) {
+					my ($user_id,$user_pwd) = ant_credentials( $ant );
+					mdap_send("INFO MDAP/$mdap_ver\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
+				}
 				next;
 			}
 
@@ -171,10 +191,10 @@
 					print "UPDATE STEP 1 on ant $ant version $build -> $new_build\n";
 					mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:software upgrade\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
 				} else {
-					print "OK ant $ant allready updated...\n";
+					once "OK ant $ant has $build\n";
 				}
 			} else {
-				print "!! NO FIRMWARE for $board in $tftp_path for ant $ant, skipping update\n";
+				once "!! NO FIRMWARE for $board in $tftp_path for ant $ant, skipping update\n";
 			}
 		} elsif ( $type eq 'REPLY-EXEC-CLI' && $h->{'SEQ-NR'} == 1 ) {
 				print "UPDATE STEP 2 on ant $ant\n";