--- mdap-server.pl	2007/04/23 23:36:57	26
+++ mdap-server.pl	2007/04/24 15:44:20	31
@@ -11,6 +11,7 @@
 my $debug = 0;
 my $quiet = 1;
 my $verbose = 0;
+my $credentials = 0;
 
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
@@ -23,6 +24,7 @@
 	"verbose!"	=> \$verbose,
 	"search=i"	=> \$resend_search_delay,
 	"tftp=s"	=> \$tftp_path,
+	"credentials"	=> \$credentials,
 );
 
 $quiet = 0 if $verbose;
@@ -38,7 +40,7 @@
 	while(<$fh>) {
 		chomp;
 		next if /^#/ || /^$/ || /^\s+$/;
-		if (/^\S+\t\S+$/) {
+		if (/^\S+\s\S+$/) {
 			push @try_accounts, $_;
 		} else {
 			warn "invalid $passwd_path entry: $_\n";
@@ -104,6 +106,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 +118,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 +130,7 @@
 	my $ant = shift || die "no ant?";
 
 	return 0 if ant_unknown_password( $ant );
+	return 0 if $ant_ok_password->{$ant};
 
 	$ant_passwd->{$ant}++;
 
@@ -140,6 +143,13 @@
 	return 1;
 }
 
+sub forget_ant {
+	my $ant = shift || die "no ant?";
+	delete $ant_unknown_password->{$ant};
+	delete $ant_passwd->{$ant};
+	delete $ant_ok_password->{$ant};
+}
+
 my $once;
 
 sub once {
@@ -148,6 +158,16 @@
 	print $m if ($once->{$m} == 1);
 }
 
+my $status = '';
+
+sub status {
+	my $m = join('', @_);
+	if ($m ne $status) {
+		print $m;
+		$status = $m;
+	}
+}
+
 local $SIG{ALRM} = sub {
 	mdap_send("ANT-SEARCH MDAP/1.1\r\n");
 	alarm( $resend_search_delay );
@@ -189,15 +209,17 @@
 		} elsif ($type eq 'REPLY-INFO') {
 
 			if ( $seq_nr < 0 ) {
-				if ( $ant_ok_password ) {
-					$ant_ok_password->{$ant} = 0;
-				} elsif ( ant_another_passwd( $ant ) ) {
+#				if ( $ant_ok_password ) {
+#					$ant_ok_password->{$ant} = 0;
+#				} elsif ( ant_another_passwd( $ant ) ) {
+				if ( 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}++;
+				print "$ant credentials $user_id $user_pwd\n" if ($credentials && $ant_ok_password->{$ant} == 1);
 			}
 
 			my $board = $h->{'_BOARD_NAME'} || die "no _BOARD_NAME?";
@@ -213,16 +235,28 @@
 						$ant_ok_password->{$ant} ? ' password protected' :
 						'',
 						"\n";
+					$ant_flashing->{$ant} = 0;
+					my $waiting = 0;
+					my $count = 0;
+					map {
+						$waiting++ if ($ant_flashing->{$_});
+						$count++;
+					} keys %$ant_flashing;
+					if ($waiting == 0) {
+						status "ALL $count ANTS FLASHED to $build\n";
+						$ant_flashing = undef;
+					} else {
+						status "$waiting of $count ants still flasing upto $build\n";
+					}
 				}
 			} else {
 				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 "+ $ant bootp mode re-flash started\n";
+				print "+ $ant bootp mode re-flash started\n" if ($verbose);
 				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;
+				forget_ant( $ant );
+				$ant_flashing->{$ant}++;
 		} else {
 			print "!! reply ignored ", dump( $h ), $/;
 		}