--- mdap-server.pl	2007/04/22 16:40:49	9
+++ mdap-server.pl	2007/04/23 17:42:42	17
@@ -12,6 +12,26 @@
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+# tab-delimited list of user id/passwd to try on ants
+my @try_accounts = ( "Administrator\t" );
+
+my $passwd_path = $0;
+$passwd_path =~ s/[^\/]+$/passwd/;
+
+if (-e $passwd_path) {
+	open(my $fh, $passwd_path) || die "can't open $passwd_path: $!";
+	while(<$fh>) {
+		chomp;
+		next if /^#/ || /^$/ || /^\s+$/;
+		if (/^\S+\t\S+$/) {
+			push @try_accounts, $_;
+		} else {
+			warn "invalid $passwd_path entry: $_\n";
+		}
+	}
+	print "found ", $#try_accounts, " accounts to try on password protected ants\n";
+}
+
 warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\n";
 
 sub fw {
@@ -54,7 +74,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 {
@@ -63,14 +88,30 @@
 	}
 }
 
+my $ant_passwd_try;
+
+sub ant_credentials {
+	my $ant = shift || die "no ant?";
+	my $i = $ant_passwd_try->{$ant} || 0;
+	my ($user_id,$user_pwd) = split(/\t/, $try_accounts[$i]);
+	#warn "ant $ant as [$i] $user_id / $user_pwd\n";
+	return ($user_id,$user_pwd);
+}
+
+sub ant_another_passwd {
+	my $ant = shift || die "no ant?";
+	$ant_passwd_try->{$ant}++;
+	$ant_passwd_try->{$ant} = 0 if ( $ant_passwd_try->{$ant} > $#try_accounts );
+}
+
 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;
@@ -89,19 +130,31 @@
 
 		warn dump($h),$/ if ($debug);
 
-		# we are getting our own INFO messages
+		# we are getting our own messages (since our source port
+		# is same as destination)
 		next if ( $type =~ m#^(INFO|ANT-SEARCH|EXEC-CLI)# );
 
 		my $ant = $h->{'ANT-ID'} || die "no ANT-ID in ", dump( $h );
 
+		my ($user_id,$user_pwd) = ant_credentials( $ant );
+
 		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') {
+
+			if ($h->{'SEQ-NR'} < 0) {
+				warn "!! password protected ant $ant, skipping\n";
+				ant_another_passwd( $ant );
+				next;
+			}
+
 			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 +163,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 ), $/;
 		}