finish();
dbg('err', "AGW initialising and connecting to $addr/$port ...");
- $sock = IO::Socket::INET->new(PeerAddr => $addr, PeerPort => $port, Proto=>'tcp', Timeout => 30);
+ $sock = IO::Socket::INET->new(PeerAddr => $addr, PeerPort => $port, Proto=>'tcp', Timeout=>15);
unless ($sock) {
dbg('err', "Cannot connect to AGW Engine at $addr/$port $!");
return;
$finishing = 1;
dbg('err', "AGW ending...");
for (values %circuit) {
+ &{$_->{eproc}}() if $_->{eproc};
$_->disconnect;
}
# say we are going
return 0; # fail. Message remains in queue ..
}
}
+ if (isdbg('raw')) {
+ dbgdump('raw', "send $bytes_written: ", $msg);
+ }
$offset += $bytes_written;
$bytes_to_write -= $bytes_written;
}
if (defined ($bytes_read)) {
if ($bytes_read > 0) {
$inmsg .= $msg;
+ if (isdbg('raw')) {
+ dbgdump('raw', "read $bytes_read: ", $msg);
+ }
}
} else {
if (Msg::_err_will_block($!)) {
if (defined $bytes_read && $bytes_read == 0) {
finish();
} else {
- _decode() if length $inmsg > 36;
+ _decode() if length $inmsg >= 36;
}
}
Msg::set_event_handler($sock, read=>undef, write=>undef, error=>undef);
$sock = undef;
for (%circuit) {
- next unless $_->isa('AGWMsg');
+ &{$_->{eproc}}() if $_->{eproc};
$_->disconnect;
}
}
} elsif ($sort eq 'd') {
dbg('agw', "AGW '$from'->'$to' port: $port Disconnected");
my $conn = _find($from eq $main::mycall ? $to : $from);
- $conn->in_disconnect if $conn;
+ if ($conn) {
+ &{$conn->{eproc}}() if $conn->{eproc};
+ $conn->in_disconnect;
+ }
} elsif ($sort eq 'y') {
my ($frames) = unpack "V", $data;
dbg('agwpollans', "AGW Frames Outstanding on port $port = $frames");
dbg('agw', "AGW Port: $_");
}
for (my $i = 0; $i < $noports; $i++) {
- _sendf('y', undef, undef, $i );
+ _sendf('y', undef, undef, $i);
+ _sendf('g', undef, undef, $i);
}
} else {
my $d = unpack "Z*", $data;
{
my $conn = shift;
delete $circuit{$conn->{agwcall}};
- _sendf('d', $conn->{agwcall}, $main::mycall, $conn->{agwport}, $conn->{agwpid});
$conn->SUPER::disconnect;
}
$msg =~ s/^[-\w]+\|//;
# _sendf('Y', $main::mycall, $conn->{call}, $conn->{agwport}, $conn->{agwpid});
_sendf('D', $main::mycall, $conn->{agwcall}, $conn->{agwport}, $conn->{agwpid}, $msg . $conn->{lineend});
+ my $len = length($msg) + 1;
+ dbg('agw', "AGW Data Out port: $conn->{agwport} pid: $conn->{agwpid} '$main::mycall'->'$conn->{agwcall}' length: $len \"$msg\"");
}
}