--- mdap-server.pl 2007/11/16 16:21:45 49 +++ mdap-server.pl 2007/11/16 19:12:08 58 @@ -162,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 { @@ -246,8 +238,7 @@ 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 @@ -266,25 +257,30 @@ } } } 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 "## plugin $plugin sending $command to $ant\n"; + + 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\n$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\n"; + warn "EXEC-CLI failed: $data\n"; } } else {