X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=5e975c157bf18d903e8a11b3acdef0838cc6340a;hb=4a653ce0cd9140d4a7878cdf8ee835841ca039eb;hp=b84945783155cd70a36685524ab78bf50fd98735;hpb=b06a8b34356732ab544f4bba0102c5793b34e3d9;p=spider.git diff --git a/perl/client.pl b/perl/client.pl index b8494578..5e975c15 100755 --- a/perl/client.pl +++ b/perl/client.pl @@ -119,6 +119,8 @@ sub rec_socket if ($buffered) { if (length $outqueue >= $client_buffer_lth) { print $stdout $outqueue; + pop @echo while (@echo > $maxecho); + push @echo, $outqueue; $outqueue = ""; } $outqueue .= "$savenl$line$snl"; @@ -144,6 +146,8 @@ sub rec_socket } elsif ($sort eq 'B') { if ($buffered && $outqueue) { print $stdout $outqueue; + pop @echo while(@echo > $maxecho); + push @echo, $outqueue; $outqueue = ""; } $buffered = $line; # set buffered or unbuffered @@ -199,6 +203,7 @@ sub rec_stdin unshift @lines, ($lastbit . $first) if ($first); foreach $first (@lines) { # print "send_now $call $first\n"; + next if grep {$_ eq $first } @echo; $conn->send_later("I$call|$first"); } $lastbit = $buf; @@ -340,6 +345,7 @@ $savenl = ""; # an NL that has been saved from last time $timeout = 60; # default timeout for connects $abort = ""; # the current abort string $cpath = "$root/connect"; # the basic connect directory +$maxecho = 5; # length of max echo queue $pid = 0; # the pid of the child program $csort = ""; # the connection type @@ -413,7 +419,7 @@ if ($loginreq) { $s =~ s/\s+//og; $s =~ s/-\d+$//o; # no ssids! cease(0) unless $s && $s gt ' '; - unless (iscallsign($s)) { + unless (is_callsign($s)) { $stdout->print("Sorry, $s is an invalid callsign"); cease(0); }