diff --git a/tests/cfg-aprsc/acl-all.acl b/tests/cfg-aprsc/acl-all.acl index b3c803d..1c72af2 100644 --- a/tests/cfg-aprsc/acl-all.acl +++ b/tests/cfg-aprsc/acl-all.acl @@ -4,6 +4,7 @@ allow 127.0.0.1 allow 44.0.0.0/8 allow 83.145.252.0/24 +allow 85.188.1.0/24 allow ::1/128 allow 2001:1bc8:101:1::/64 diff --git a/tests/t/51load.t b/tests/t/51load.t index 4194179..fd12727 100644 --- a/tests/t/51load.t +++ b/tests/t/51load.t @@ -35,7 +35,7 @@ sleep(0.5); ############################################ my $flush_interval = 500; -#$flush_interval = 300; +$flush_interval = 300; my $bytelimit = 4*1024*1024; my $window = 64*1024; #my $window = 2*1024; diff --git a/tools/aprs-is-multirx b/tools/aprs-is-multirx index 8dfe1a1..843c64b 100644 --- a/tools/aprs-is-multirx +++ b/tools/aprs-is-multirx @@ -12,6 +12,7 @@ my $quit = 0; my $APRSIS; my $mycall = $ARGV[0] . '-'; +my $server = $ARGV[1]; #my $filter = 'p/OH2R'; #my $filter = 'p/OH'; my $filter = 'p/OH2R -p/OH2 p/OH '; @@ -19,20 +20,20 @@ $filter = 'p/OH/OI/OJ/OF'; my @APRS = (); -my $n = 50; +my $n = $ARGV[2]; my $MUX = new IO::Multiplex; -foreach my $i (1 .. $n) { - my $call = sprintf("%s%d",$mycall,$i); - if (($i % 3) == 0) { # filters only for 1/3'd of all contactees.. - $APRSIS = Ham::APRS::IS->new('localhost:55580', $call, filter => $filter ); -# } elsif (($i % 3) == 1) { -# $call = sprintf("CW%04d",$i); -# $APRSIS = Ham::APRS::IS->new('localhost:55152', $call); - } else { - $APRSIS = Ham::APRS::IS->new('localhost:55152', $call); - } +warn "Connecting to $server as $mycall with $n sockets\n"; + +my $call_n = 0; + +sub connect_new() +{ + my $call = sprintf("%s%d",$mycall,$call_n); + $call_n++; + $APRSIS = Ham::APRS::IS->new($server, $call); + if (!defined($APRSIS)) { printf "Failed to init Ham::APRS::IS socket!\n"; exit 4; @@ -44,8 +45,10 @@ foreach my $i (1 .. $n) { } $MUX->add( $APRSIS->{'sock'} ); +} - push @APRS, $APRSIS; +foreach my $i (1 .. $n) { + connect_new(); } $MUX->set_callback_object(__PACKAGE__); $MUX->loop(); @@ -73,12 +76,17 @@ sub mux_input { $$data = ''; } +my $eofs = 0; sub mux_eof { - my $package = shift; - my $mux = shift; - my $fh = shift; - - $MUX->close($fh); + my $package = shift; + my $mux = shift; + my $fh = shift; + $eofs++; + warn "eof $eofs\n"; + + $MUX->close($fh); + + connect_new(); }