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;
$ypolltime = 10 unless defined $ypolltime;
$hpolltime = 300 unless defined $hpolltime;
%circuit = ();
+$total_in = $total_out = 0;
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
if (isdbg('raw')) {
dbgdump('raw', "AGW send $bytes_written: ", $msg);
}
+ $total_out += $bytes_written;
$offset += $bytes_written;
$bytes_to_write -= $bytes_written;
}
$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);
$data = '' unless defined $data;
if ($sort eq 'D') {
my $d = unpack "Z*", $data;
- $d =~ s/\cM$//;
+ $d =~ s/\cM\cJ?$//;
+ $d =~ s/^\cJ//;
dbg("AGW Data In port: $port pid: $pid '$from'->'$to' length: $len \"$d\"") if isdbg('agw');
my $conn = _find($from eq $main::mycall ? $to : $from);
if ($conn) {
$conn->to_connected($conn->{call}, 'O', $conn->{csort});
}
} else {
- my @lines = split /\cM/, $data;
- if (@lines) {
- for (@lines) {
- &{$conn->{rproc}}($conn, "I$conn->{call}|$_");
- }
- } else {
- &{$conn->{rproc}}($conn, "I$conn->{call}|");
+ my @lines = split /\cM\cJ?/, $d;
+ push @lines, $d unless @lines;
+ for (@lines) {
+ &{$conn->{rproc}}($conn, "I$conn->{call}|$_");
}
}
} else {
}
} elsif ($sort eq 'I' || $sort eq 'S' || $sort eq 'U' || $sort eq 'M' || $sort eq 'T') {
my $d = unpack "Z*", $data;
- $d =~ s/\cM$//;
- my @lines = split /\cM/, $d;
+ $d =~ s/^\cJ//;
+ $d =~ s/\cM\cJ?$//;
+ my @lines = split /\cM\cJ?/, $d;
for (@lines) {
- s/([\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+# s/([\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
dbg("AGW Monitor port: $port \"$_\"") if isdbg('agw');
}
} elsif ($sort eq 'C') {
my $d = unpack "Z*", $data;
- $d =~ s/\cM$//;
+ $d =~ s/\cM\cJ?$//;
dbg("AGW Connect port: $port pid: $pid '$from'->'$to' \"$d\"") if isdbg('agw');
my $call = $from eq $main::mycall ? $to : $from;
my $conn = _find($call);
}
} elsif ($sort eq 'd') {
my $d = unpack "Z*", $data;
- $d =~ s/\cM$//;
+ $d =~ s/\cM\cJ?$//;
dbg("AGW '$from'->'$to' port: $port Disconnected ($d)") if isdbg('agw');
my $conn = _find($from eq $main::mycall ? $to : $from);
if ($conn) {
} elsif ($sort eq 'H') {
unless ($from =~ /^\s+$/) {
my $d = unpack "Z*", $data;
- $d =~ s/\cM$//;
+ $d =~ s/\cM\cJ?$//;
dbg("AGW Heard port: $port \"$d\"") if isdbg('agw');
}
} elsif ($sort eq 'X') {