--- mdap-server.pl	2007/04/23 19:06:18	19
+++ mdap-server.pl	2007/04/23 23:32:49	25
@@ -103,20 +103,49 @@
 	}
 }
 
-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_unknown_password;
+my $ant_ok_password;
+
+sub ant_unknown_password {
+	my $ant = shift || die "no ant?";
+	if ( $ant_unknown_password->{$ant} ) {
+		$ant_unknown_password->{$ant}--;
+	}
+	return $ant_unknown_password->{$ant};
+}
+
 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 0 if ant_unknown_password( $ant );
+
+	$ant_passwd->{$ant}++;
+
+	if ( $ant_passwd->{$ant} > $#try_accounts ) {
+		print "$ant ant with unknown password\n";
+		$ant_unknown_password->{$ant} = 60;
+		$ant_passwd->{$ant} = 0;
+		return 0;
+	}
+	return 1;
+}
+
+my $once;
+
+sub once {
+	my $m = join('', @_);
+	$once->{$m}++;
+	print $m if ($once->{$m} == 1);
 }
 
 local $SIG{ALRM} = sub {
@@ -150,17 +179,25 @@
 		next if ( $type =~ m#^(INFO|ANT-SEARCH|EXEC-CLI)# );
 
 		my $ant = $h->{'ANT-ID'} || die "no ANT-ID in ", dump( $h );
+		my $seq_nr = $h->{'SEQ-NR'};
+		#warn "SEQ-NR: $seq_nr ok: ",$ant_ok_password->{$ant},"\n" if ($seq_nr);
 
 		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_unknown_password( $ant );
 		} elsif ($type eq 'REPLY-INFO') {
 
-			if ($h->{'SEQ-NR'} < 0) {
-				warn "!! password protected ant $ant, skipping\n";
-				ant_another_passwd( $ant );
+			if ( $seq_nr < 0 ) {
+				if ( $ant_ok_password ) {
+					$ant_ok_password->{$ant} = 0;
+				} elsif ( ant_another_passwd( $ant ) ) {
+					($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;
+			} else {
+				$ant_ok_password->{$ant}++;
 			}
 
 			my $board = $h->{'_BOARD_NAME'} || die "no _BOARD_NAME?";
@@ -168,17 +205,24 @@
 				my $build = $h->{'_BUILD'} || die "no _BUILD?";
 				my $new_build = fw_build( $board );
 				if ( $build ne $new_build ) {
-					print "UPDATE STEP 1 on ant $ant version $build -> $new_build\n";
+					print "+ $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 "$ant OK version $build",
+						$ant_unknown_password->{$ant} ? ' with unknown password' :
+						$ant_ok_password->{$ant} ? ' password protected' :
+						'',
+						"\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";
+				print "+ $ant bootp mode re-flash started\n";
 				mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nSEQ-NR:2\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
+				$ant_unknown_password->{$ant} = 0;
+				$ant_passwd->{$ant} = 0;
+				$ant_ok_password->{$ant} = 0;
 		} else {
 			print "!! reply ignored ", dump( $h ), $/;
 		}