--- mdap-server.pl	2007/04/22 16:40:49	9
+++ mdap-server.pl	2007/04/22 23:29:05	14
@@ -12,6 +12,9 @@
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+my $user_id = 'Administrator';
+my $user_pwd = '';
+
 warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\n";
 
 sub fw {
@@ -54,7 +57,12 @@
 
 sub mdap_send {
 	my $data = shift;
-	$sock->mcast_send( "${data}", GROUP . ':' . PORT );
+
+	my $xor = 0;
+	map { $xor ^= ord($_) } split(//,$data);
+	$data .= sprintf('%02X', $xor);
+
+	$sock->mcast_send( $data, GROUP . ':' . PORT );
 	if ($debug) {
 		warn ">> ", dump( $data ), $/;
 	} else {
@@ -64,13 +72,13 @@
 }
 
 local $SIG{ALRM} = sub {
-	mdap_send("ANT-SEARCH MDAP/1.1\r\n46");
+	mdap_send("ANT-SEARCH MDAP/1.1\r\n");
 	alarm( $resend_search_delay );
 };
 
 alarm( $resend_search_delay );
 
-mdap_send("ANT-SEARCH MDAP/1.1\r\n46");
+mdap_send("ANT-SEARCH MDAP/1.1\r\n");
 
 while (1) {
 	my $data;
@@ -95,13 +103,15 @@
 		my $ant = $h->{'ANT-ID'} || die "no ANT-ID in ", dump( $h );
 
 		if ($type eq 'REPLY-ANT-SEARCH') {
-			mdap_send("INFO MDAP/$mdap_ver\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:$user_id\r\nUSER-PWD:$user_pwd\r\n");
 		} 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/$mdap_ver\r\nCLI-CMD:software upgrade\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:Administrator\r\nUSER-PWD:\r\n1F");
+				my $build = $h->{'_BUILD'} || die "no _BUILD?";
+				my $new_build = fw_build( $board );
+				if ( $build ne $new_build ) {
+					print "UPDATE STEP 1 on ant $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");
 				} else {
 					print "OK ant $ant allready updated...\n";
 				}
@@ -110,7 +120,7 @@
 			}
 		} elsif ( $type eq 'REPLY-EXEC-CLI' && $h->{'SEQ-NR'} == 1 ) {
 				print "UPDATE STEP 2 on ant $ant\n";
-				mdap_send("EXEC-CLI MDAP/$mdap_ver\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:$user_id\r\nUSER-PWD:$user_pwd\r\n");
 		} else {
 			print "!! reply ignored ", dump( $h ), $/;
 		}