--- mdap-server.pl	2007/04/23 21:26:08	23
+++ mdap-server.pl	2007/04/23 23:11:30	24
@@ -113,17 +113,19 @@
 	return ($user_id,$user_pwd);
 }
 
-my $ant_password_protected;
+my $ant_unknown_password;
+my $ant_ok_password;
 
 sub ant_another_passwd {
 	my $ant = shift || die "no ant?";
-	return if ( $ant_password_protected->{$ant} );
+	return 0 if ( $ant_unknown_password->{$ant} );
 
 	$ant_passwd->{$ant}++;
 
 	if ( $ant_passwd->{$ant} > $#try_accounts ) {
 		print "$ant ant with unknown password\n";
-		$ant_password_protected->{$ant}++;
+		$ant_unknown_password->{$ant}++;
+		$ant_passwd->{$ant} = 0;
 		return 0;
 	}
 	return 1;
@@ -168,19 +170,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") unless ( $ant_password_protected->{$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") unless ( $ant_unknown_password->{$ant} );
 		} elsif ($type eq 'REPLY-INFO') {
 
-			if ($h->{'SEQ-NR'} < 0) {
-				if ( ant_another_passwd( $ant ) ) {
-					my ($user_id,$user_pwd) = ant_credentials( $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?";
@@ -192,7 +200,9 @@
 					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 {
 					once "$ant OK version $build",
-						$ant_password_protected->{$ant} ? '' : ' with password',
+						$ant_unknown_password->{$ant} ? ' with unknown password' :
+						$ant_ok_password->{$ant} ? ' password protected' :
+						'',
 						"\n";
 				}
 			} else {
@@ -201,7 +211,9 @@
 		} elsif ( $type eq 'REPLY-EXEC-CLI' && $h->{'SEQ-NR'} == 1 ) {
 				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_password_protected->{$ant} = 0;
+				$ant_unknown_password->{$ant} = 0;
+				$ant_passwd->{$ant} = 0;
+				$ant_ok_password->{$ant} = 0;
 		} else {
 			print "!! reply ignored ", dump( $h ), $/;
 		}