X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAGWMsg.pm;h=1888ac6f2dcdf9e5026528c9e8449418cb06fed9;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=693f31085235cc6105301d403251e7fbceffe76f;hpb=428f70e71f52606449895be3d6b0d4fae7c0bc75;p=spider.git

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 693f3108..1888ac6f 100644
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -30,7 +30,7 @@ use AGWConnect;
 use DXDebug;
 
 use vars qw(@ISA $sock @outqueue $send_offset $inmsg $rproc $noports $lastytime 
-			$lasthtime $ypolltime $hpolltime %circuit);
+			$lasthtime $ypolltime $hpolltime %circuit $total_in $total_out);
 
 @ISA = qw(Msg ExtMsg);
 $sock = undef;
@@ -43,12 +43,7 @@ $lastytime = $lasthtime = time;
 $ypolltime = 10 unless defined $ypolltime;
 $hpolltime = 300 unless defined $hpolltime;
 %circuit = ();
-
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+$total_in = $total_out = 0;
 
 sub init
 {
@@ -103,6 +98,11 @@ sub finish
 	}
 }
 
+sub login
+{
+	goto &main::login;        # save some writing, this was the default
+}
+
 sub active
 {
 	return $sock;
@@ -171,6 +171,7 @@ sub _send
 			if (isdbg('raw')) {
 				dbgdump('raw', "AGW send $bytes_written: ", $msg);
 			}
+            $total_out      += $bytes_written;
             $offset         += $bytes_written;
             $bytes_to_write -= $bytes_written;
         }
@@ -196,6 +197,7 @@ sub _rcv {                     # Complement to _send
 	$bytes_read = sysread ($sock, $msg, 1024, 0);
 	if (defined ($bytes_read)) {
 		if ($bytes_read > 0) {
+            $total_in += $bytes_read;
 			$inmsg .= $msg;
 			if (isdbg('raw')) {
 				dbgdump('raw', "AGW read $bytes_read: ", $msg);
@@ -324,15 +326,9 @@ sub _decode
 				$conn->{incoming} = 1;
 				$conn->{agwcall} = $call;
 				$circuit{$call} = $conn;
-				if ($call =~ /^(\w+)-(\d\d?)$/) {
-					my $c = $1;
-					my $s = $2;
-					$s = 15 - $s;
-					if ($s <= 8 && $s > 0) {
-						$call = "${c}-${s}";
-					} else {
-						$call = $c;
-					}
+				if (my ($c, $s) = $call =~ /^(\w+)-(\d\d?)$/) {
+					$s = 15 - $s if $s > 8;
+					$call = $s > 0 ? "${c}-${s}" : $c;
 				}
 				$conn->to_connected($call, 'A', $conn->{csort} = 'ax25');
 			}