X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FEphMsg.pm;h=bf43a334872be9fbede5aebfc5abb56a8284011e;hb=cbb522ef802d48991734a4ce803fa6ffa9774588;hp=eabba932ef761cbf51b03c696d6c7240231121d9;hpb=8f5f9afaa7488fd046147e6b9136b0fc772a1463;p=spider.git diff --git a/perl/EphMsg.pm b/perl/EphMsg.pm index eabba932..bf43a334 100644 --- a/perl/EphMsg.pm +++ b/perl/EphMsg.pm @@ -6,7 +6,7 @@ # An instance of this is setup by a command together with a load # of callbacks and then runs with a state machine until completion # -# $Id$ +# # # Copyright (c) 2001 - Dirk Koopman G1TLH # @@ -45,7 +45,7 @@ sub dequeue my $conn = shift; my $msg; - if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) { + if ($conn->ax25 && exists $conn->{msg}) { $conn->{msg} =~ s/\cM/\cJ/g; } @@ -61,6 +61,8 @@ sub dequeue $conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g; } + $conn->{linesin} += @lines; + $Msg::total_lines_in += @lines; while (defined ($msg = shift @lines)) { dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect'); @@ -71,19 +73,6 @@ sub dequeue } } -sub to_connected -{ - my ($conn, $call, $dir, $sort) = @_; - $conn->{state} = 'C'; - $conn->conns($call); - delete $conn->{cmd}; - $conn->{timeout}->del if $conn->{timeout}; - delete $conn->{timeout}; - $conn->nolinger; - &{$conn->{rproc}}($conn, "$dir$call|$sort"); -} - - sub start_connect { my $call = shift;