--- mdap-server.pl	2007/04/22 16:06:03	8
+++ mdap-server.pl	2007/04/22 16:40:49	9
@@ -9,11 +9,11 @@
 
 my $debug = shift @ARGV;
 
-my $local_port = 1000;
-
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\n";
+
 sub fw {
 	my ($board, $offset,$len) = @_;
 	open(my $fh, "$tftp_path/$board") || die "Can't open image $tftp_path/$board: $!";
@@ -54,8 +54,13 @@
 
 sub mdap_send {
 	my $data = shift;
-	warn ">> $data\n>>----------\n" if ($debug);
 	$sock->mcast_send( "${data}", GROUP . ':' . PORT );
+	if ($debug) {
+		warn ">> ", dump( $data ), $/;
+	} else {
+		$data =~ s/\s+/ /gi;
+		warn ">> ", substr($data,0,70), $/;
+	}
 }
 
 local $SIG{ALRM} = sub {
@@ -71,26 +76,32 @@
 	my $data;
 	next unless $sock->recv($data,1024);
 
-	if ( $data =~ m#^(REPLY-\S+)\s(MDAP/\d+\.\d+)# ) {
+	if ( $data =~ m#^(INFO|ANT-SEARCH|EXEC-CLI|REPLY-\S+)\s(MDAP)/(\d+\.\d+)# ) {
 
-		my ($type,$proto) = ($1,$2);
+		my ($type,$proto,$mdap_ver) = ($1,$2,$3);
 
 		my $h = ant2hash($data);
 
-		my $ant = $h->{'ANT-ID'} || die "no ANT-ID in ", dump( $h );
+		my $client_version = $h->{'MDAP-VERSION'};
+		$mdap_ver = $client_version if ($client_version);
 
-		print "<< $type $proto ", length($data), " bytes\n";
+		print "<< $type $proto/$mdap_ver << ", length($data), " bytes\n";
 
 		warn dump($h),$/ if ($debug);
 
+		# we are getting our own INFO messages
+		next if ( $type =~ m#^(INFO|ANT-SEARCH|EXEC-CLI)# );
+
+		my $ant = $h->{'ANT-ID'} || die "no ANT-ID in ", dump( $h );
+
 		if ($type eq 'REPLY-ANT-SEARCH') {
-			mdap_send("INFO MDAP/1.2\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n22");
+			mdap_send("INFO MDAP/$mdap_ver\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n22");
 		} elsif ($type eq 'REPLY-INFO') {
 			my $board = $h->{'_BOARD_NAME'} || die "no _BOARD_NAME?";
 			if ( fw_exists( $board ) ) {
 				if ( $h->{'_BUILD'} ne fw_build( $board ) ) {
 					print "UPDATE STEP 1 on ant $ant\n";
-					mdap_send("EXEC-CLI MDAP/1.2\r\nCLI-CMD:software upgrade\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n1F");
+					mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:software upgrade\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n1F");
 				} else {
 					print "OK ant $ant allready updated...\n";
 				}
@@ -99,7 +110,7 @@
 			}
 		} elsif ( $type eq 'REPLY-EXEC-CLI' && $h->{'SEQ-NR'} == 1 ) {
 				print "UPDATE STEP 2 on ant $ant\n";
-				mdap_send("EXEC-CLI MDAP/1.2\r\nSEQ-NR:2\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n5F");
+				mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nSEQ-NR:2\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n5F");
 		} else {
 			print "!! reply ignored ", dump( $h ), $/;
 		}