Add latest RBN chnages and data stats

[spider.git] / perl / EphMsg.pm

diff --git a/perl/EphMsg.pm b/perl/EphMsg.pm
index eabba932ef761cbf51b03c696d6c7240231121d9..bf43a334872be9fbede5aebfc5abb56a8284011e 100644 (file)
--- 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;