X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=cd18eb9318039974b7ae7f95101c7c9aeb534f46;hb=e674587476599456cce169e02b0e441d985f9dd8;hp=81b9a1bc33b727798573dc91291e7492b2a33592;hpb=1f8f005a832b88884c28bea72bb61cc8d3f55c12;p=spider.git diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm index 81b9a1bc..cd18eb93 100644 --- a/perl/ExtMsg.pm +++ b/perl/ExtMsg.pm @@ -71,9 +71,8 @@ sub dequeue } elsif ($conn->{state} eq 'WL' ) { $msg = uc $msg; if (is_callsign($msg)) { + &{$conn->{rproc}}($conn, "A$msg|telnet"); _send_file($conn, "$main::data/connected"); - $conn->{call} = $msg; - &{$conn->{rproc}}($conn, "A$conn->{call}|telnet"); $conn->{state} = 'C'; } else { $conn->send_now("Sorry $msg is an invalid callsign"); @@ -131,12 +130,11 @@ sub start_connect my $call = shift; my $fn = shift; my $conn = ExtMsg->new(\&main::rec); - $conn->{call} = $call; + $conn->conns($call); my $f = new IO::File $fn; push @{$conn->{cmd}}, <$f>; $f->close; - push @main::outstanding_connects, {call => $call, conn => $conn}; $conn->_dotimeout($deftimeout); $conn->_docmd; } @@ -171,9 +169,6 @@ sub _docmd } last if $conn->{state} eq 'E'; } - unless (exists $conn->{cmd} && @{$conn->{cmd}}) { - @main::outstanding_connects = grep {$_->{call} ne $conn->{call}} @main::outstanding_connects; - } } sub _doconnect @@ -261,7 +256,6 @@ sub _timeout my $conn = shift; dbg('connect', "timed out after $conn->{timeval} seconds"); $conn->disconnect; - @main::outstanding_connects = grep {$_->{call} ne $conn->{call}} @main::outstanding_connects; } # handle callsign and connection type firtling