--- mdap-server.pl	2007/04/26 12:07:49	37
+++ mdap-server.pl	2007/11/16 19:12:08	58
@@ -1,10 +1,14 @@
 #!/usr/bin/perl
 
+use warnings;
 use strict;
 use IO::Socket::Multicast;
 use Data::Dump qw/dump/;
 use Getopt::Long;
 
+use lib './lib';
+use MDAP;
+
 my $GROUP = '224.0.0.103';
 my $PORT  = '3235';
 
@@ -13,9 +17,13 @@
 my $verbose = 0;
 my $credentials = 0;
 
+my $plugins = 1;
+
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+my $flashed_cmd = 'system config led=flash';
+
 GetOptions(
 	"port=i"	=> \$PORT,
 	"group=s"	=> \$GROUP,
@@ -25,6 +33,8 @@
 	"search=i"	=> \$resend_search_delay,
 	"tftp=s"	=> \$tftp_path,
 	"credentials"	=> \$credentials,
+	"exec=s"	=> \$flashed_cmd,
+	'plugins!'	=> \$plugins,
 );
 
 $quiet = 0 if $verbose;
@@ -47,10 +57,11 @@
 			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) = @_;
@@ -151,14 +162,6 @@
 	delete $ant_ok_password->{$ant};
 }
 
-my $once;
-
-sub once {
-	my $m = join('', @_);
-	$once->{$m}++;
-	print $m if ($once->{$m} == 1);
-}
-
 my $status = '';
 
 sub status {
@@ -200,7 +203,7 @@
 		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'};
+		my $seq_nr = $1 if (defined $h->{'SEQ-NR'} && $h->{'SEQ-NR'} =~ m/^-*(\d)+/);
 		#warn "SEQ-NR: $seq_nr ok: ",$ant_ok_password->{$ant},"\n" if ($seq_nr);
 
 		my ($user_id,$user_pwd) = ant_credentials( $ant );
@@ -235,12 +238,11 @@
 					once "$ant OK version $build",
 						$ant_unknown_password->{$ant} ? ' with unknown password' :
 						$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:system config led=flash\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");
+					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 {
@@ -255,14 +257,32 @@
 					}
 				}
 			} else {
-				once "!! 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";
+			}
+
+			if ( $plugins ) {
+				foreach my $plugin ( MDAP->plugins ) {
+					warn "## calling $plugin\n" if $debug;
+					if ( my $command = $plugin->check( $h ) ) {
+
+						warn ">> $ant ",
+							$h->{'ANT-NAME'}, " ",
+							$h->{'_BUILD'}, " ",
+							"\t:$command\n";
+	
+						mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:$command\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n");		}
+				}
 			}
+
 		} elsif ( $type eq 'REPLY-EXEC-CLI' ) {
-			print "+ $type ", dump( $data ), "\n" if ($verbose);
+			print "##<< $type\n$data\n" if $debug;
 			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");
+#				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 ) if ( $ant_flashing->{$ant} );
+			} elsif ( $seq_nr < 0 ) {
+				warn "EXEC-CLI failed: $data\n";
 			}
+
 		} else {
 			print "!! reply $type ignored ", dump( $h ), $/;
 		}