X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FEphMsg.pm;h=3117aabaee61aba69c9d187fffc35e0635b21742;hb=refs%2Fheads%2Fstaging;hp=0814df84d7288d5a21f0775d4b7f3c556e00d178;hpb=fd0a34c34ad4112ee21e0730f7307498ff437e18;p=spider.git

diff --git a/perl/EphMsg.pm b/perl/EphMsg.pm
index 0814df84..3117aaba 100644
--- a/perl/EphMsg.pm
+++ b/perl/EphMsg.pm
@@ -18,6 +18,8 @@ use Msg;
 use DXVars;
 use DXUtil;
 use DXDebug;
+use DXTimer;
+
 use IO::File;
 use IO::Socket;
 use IPC::Open3;
@@ -45,7 +47,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 +63,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 +75,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;
@@ -140,7 +131,7 @@ sub _dotimeout
 	dbg("connect $conn->{cnum}: timeout set to $val") if isdbg('connect');
 	$conn->{timeout}->del if $conn->{timeout};
 	$conn->{timeval} = $val;
-	$conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
+	$conn->{timeout} = DXTimer->new($val, sub{ &_timedout($conn) });
 }