--- mdap-server.pl	2007/04/23 17:42:42	17
+++ mdap-server.pl	2007/04/23 19:06:18	19
@@ -3,15 +3,30 @@
 use strict;
 use IO::Socket::Multicast;
 use Data::Dump qw/dump/;
+use Getopt::Long;
 
-use constant GROUP => '224.0.0.103';
-use constant PORT  => '3235';
+my $GROUP = '224.0.0.103';
+my $PORT  = '3235';
 
-my $debug = shift @ARGV;
+my $debug = 0;
+my $quiet = 1;
+my $verbose = 0;
 
 my $resend_search_delay = 3;
 my $tftp_path = '/srv/tftp/';
 
+GetOptions(
+	"port=i"	=> \$PORT,
+	"group=s"	=> \$GROUP,
+	"debug!"	=> \$debug,
+	"quiet!"	=> \$quiet,
+	"verbose!"	=> \$verbose,
+	"search=i"	=> \$resend_search_delay,
+	"tftp=s"	=> \$tftp_path,
+);
+
+$quiet = 0 if $verbose;
+
 # tab-delimited list of user id/passwd to try on ants
 my @try_accounts = ( "Administrator\t" );
 
@@ -29,7 +44,7 @@
 			warn "invalid $passwd_path entry: $_\n";
 		}
 	}
-	print "found ", $#try_accounts, " accounts to try on password protected ants\n";
+	print "found ", $#try_accounts + 1, " accounts to try on password protected ants\n";
 }
 
 warn "search for ants every ${resend_search_delay}s\ntftp server path: $tftp_path\n";
@@ -47,7 +62,7 @@
 sub fw_build {
 	my $board_name = shift || return 0;
 	my $v = join('.', unpack('CCCC',fw($board_name,0x20,4)) );
-	print "# fw_build $board_name $v\n";
+	print "# fw_build $board_name $v\n" unless $quiet;
 	return $v;
 }
 
@@ -56,8 +71,8 @@
 	return -e "$tftp_path/$board";
 }
 
-my $sock = IO::Socket::Multicast->new(LocalPort=>PORT,ReuseAddr=>1);
-$sock->mcast_add(GROUP) || die "Couldn't set group: $!\n";
+my $sock = IO::Socket::Multicast->new(LocalPort=>$PORT,ReuseAddr=>1);
+$sock->mcast_add($GROUP) || die "Couldn't set group: $!\n";
 $sock->mcast_ttl(1);
 
 sub ant2hash {
@@ -79,10 +94,10 @@
 	map { $xor ^= ord($_) } split(//,$data);
 	$data .= sprintf('%02X', $xor);
 
-	$sock->mcast_send( $data, GROUP . ':' . PORT );
+	$sock->mcast_send( $data, "${GROUP}:${PORT}" );
 	if ($debug) {
 		warn ">> ", dump( $data ), $/;
-	} else {
+	} elsif( ! $quiet ) {
 		$data =~ s/\s+/ /gi;
 		warn ">> ", substr($data,0,70), $/;
 	}
@@ -126,7 +141,7 @@
 		my $client_version = $h->{'MDAP-VERSION'};
 		$mdap_ver = $client_version if ($client_version);
 
-		print "<< $type $proto/$mdap_ver << ", length($data), " bytes\n";
+		print "<< $type $proto/$mdap_ver << ", length($data), " bytes\n" unless $quiet;
 
 		warn dump($h),$/ if ($debug);