--- mdap-server.pl	2007/04/24 10:01:22	28
+++ mdap-server.pl	2007/05/07 19:29:05	39
@@ -11,10 +11,13 @@
 my $debug = 0;
 my $quiet = 1;
 my $verbose = 0;
+my $credentials = 0;
 
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+my $flashed_cmd = 'system config led=flash';
+
 GetOptions(
 	"port=i"	=> \$PORT,
 	"group=s"	=> \$GROUP,
@@ -23,9 +26,12 @@
 	"verbose!"	=> \$verbose,
 	"search=i"	=> \$resend_search_delay,
 	"tftp=s"	=> \$tftp_path,
+	"credentials"	=> \$credentials,
+	"exec=s"	=> \$flashed_cmd,
 );
 
 $quiet = 0 if $verbose;
+$credentials = 1 if $debug;
 
 # tab-delimited list of user id/passwd to try on ants
 my @try_accounts = ( "Administrator\t" );
@@ -38,16 +44,17 @@
 	while(<$fh>) {
 		chomp;
 		next if /^#/ || /^$/ || /^\s+$/;
-		if (/^\S+\t\S+$/) {
+		if (/^\S+\s+\S+$/) {
 			push @try_accounts, $_;
 		} else {
 			warn "invalid $passwd_path entry: $_\n";
 		}
 	}
-	print "found ", $#try_accounts + 1, " accounts to try on password protected ants\n";
+	print "found ", $#try_accounts + 1, " accounts to try on password protected ants",
+		$credentials ? " and display credentials" : "", "\n";
 }
 
-warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\n";
+warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\nflashed to current version: $flashed_cmd\n";
 
 sub fw {
 	my ($board, $offset,$len) = @_;
@@ -96,7 +103,7 @@
 
 	$sock->mcast_send( $data, "${GROUP}:${PORT}" );
 	if ($debug) {
-		warn ">> ", dump( $data ), $/;
+		warn ">> ${GROUP}:${PORT} >> ", dump( $data ), $/;
 	} elsif( ! $quiet ) {
 		$data =~ s/\s+/ /gi;
 		warn ">> ", substr($data,0,70), $/;
@@ -156,6 +163,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 );
@@ -180,7 +197,7 @@
 
 		print "<< $type $proto/$mdap_ver << ", length($data), " bytes\n" unless $quiet;
 
-		warn dump($h),$/ if ($debug);
+		warn dump( $data, $h ),$/ if ($debug);
 
 		# we are getting our own messages (since our source port
 		# is same as destination)
@@ -207,6 +224,7 @@
 				next;
 			} else {
 				$ant_ok_password->{$ant}++;
+				print "$ant credentials $user_id $user_pwd\n" if ( $credentials && $ant_ok_password->{$ant} == 1 ) || $debug;
 			}
 
 			my $board = $h->{'_BOARD_NAME'} || die "no _BOARD_NAME?";
@@ -216,29 +234,42 @@
 				if ( $build ne $new_build ) {
 					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");
+					$ant_flashing->{$ant}++;
 				} else {
 					once "$ant OK version $build",
 						$ant_unknown_password->{$ant} ? ' with unknown password' :
-						$ant_ok_password->{$ant} ? ' password protected' :
+						$ant_passwd->{$ant} ? ' password protected' :
 						'',
 						"\n";
+
 					$ant_flashing->{$ant} = 0;
+					# green|red|orange|flash|off
+					mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:$flashed_cmd\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
 					my $waiting = 0;
+					my $count = 0;
 					map {
 						$waiting++ if ($ant_flashing->{$_});
+						$count++;
 					} keys %$ant_flashing;
-					print "**** ALL ANTS FLASHED ****\n" if ($ant_flashing && $waiting == 0);
+					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";
+		} elsif ( $type eq 'REPLY-EXEC-CLI' ) {
+			print "+ $type\n$data\n" if ($verbose);
+			if ( $seq_nr == 1 ) {
 				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}++;
+				forget_ant( $ant ) if ( $ant_flashing->{$ant} );
+			}
+
 		} else {
-			print "!! reply ignored ", dump( $h ), $/;
+			print "!! reply $type ignored ", dump( $h ), $/;
 		}
 
 	} else {