--- mdap-server.pl 2007/04/24 09:52:05 27 +++ mdap-server.pl 2007/04/24 10:01:22 28 @@ -104,6 +104,9 @@ } my $ant_passwd; +my $ant_unknown_password; +my $ant_ok_password; +my $ant_flashing; sub ant_credentials { my $ant = shift || die "no ant?"; @@ -113,9 +116,6 @@ 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} ) { @@ -128,6 +128,7 @@ my $ant = shift || die "no ant?"; return 0 if ant_unknown_password( $ant ); + return 0 if $ant_ok_password->{$ant}; $ant_passwd->{$ant}++; @@ -221,6 +222,12 @@ $ant_ok_password->{$ant} ? ' password protected' : '', "\n"; + $ant_flashing->{$ant} = 0; + my $waiting = 0; + map { + $waiting++ if ($ant_flashing->{$_}); + } keys %$ant_flashing; + print "**** ALL ANTS FLASHED ****\n" if ($ant_flashing && $waiting == 0); } } else { once "!! NO FIRMWARE for $board in $tftp_path for ant $ant, skipping update\n"; @@ -229,6 +236,7 @@ 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"); forget_ant( $ant ); + $ant_flashing->{$ant}++; } else { print "!! reply ignored ", dump( $h ), $/; }