hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 07:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

first cut at outgoing ax25 / external connects

Browse Source
This commit is contained in:
minima 2001-03-14 01:23:35 +00:00
parent 45ded051fe
commit 15ee0303d7
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -1,3 +1,5 @@
14Mar01=======================================================================
1. first cut at outgoing ax25 /external program connects
13Mar01=======================================================================
1. implemented first cut at non blocking connect
2. removed memory leakage in connects

11
perl/DXCron.pm
View File

@ -217,14 +217,7 @@ sub disconnect
{
my $call = uc shift;
my $dxchan = DXChannel->get($call);
if ($dxchan) {
if ($dxchan->is_ak1a) {
$dxchan->send_now("D", DXProt::pc39($main::mycall, "$main::mycall DXCron"));
} else {
$dxchan->send_now('D', "");
}
$dxchan->disconnect;
}
$dxchan->disconnect if $dxchan;
}
# start a connect process off
@ -255,7 +248,6 @@ sub spawn
# in child, unset warnings, disable debugging and general clean up from us
$^W = 0;
eval "{ package DB; sub DB {} }";
alarm(0);
DXChannel::closeall();
for (@main::listeners) {
$_->close_server;
@ -263,6 +255,7 @@ sub spawn
unless ($^O =~ /^MS/) {
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
alarm(0);
}
exec "$line" or dbg('cron', "exec '$line' failed $!");
}

31
perl/ExtMsg.pm
View File

@ -58,6 +58,9 @@ sub dequeue
my $conn = shift;
my $msg;
if ($conn->{sort} eq 'ax25' && exists $conn->{msg}) {
$conn->{msg} =~ s/\cM/\cJ/g;
}
if ($conn->{state} eq 'WC') {
if (exists $conn->{cmd}) {
if (@{$conn->{cmd}}) {
@ -193,7 +196,8 @@ sub _doconnect
{
my ($conn, $sort, $line) = @_;
my $r;
$sort = lc $sort;
dbg('connect', "CONNECT sort: $sort command: $line");
if ($sort eq 'telnet') {
# this is a straight network connect
@ -206,7 +210,30 @@ sub _doconnect
dbg('connect', "***Connect Failed to $host $port $!");
}
} elsif ($sort eq 'ax25' || $sort eq 'prog') {
;
my $pid = fork();
if (defined $pid) {
if (!$pid) {
# in child, unset warnings, disable debugging and general clean up from us
$^W = 0;
eval "{ package DB; sub DB {} }";
DXChannel::closeall();
for (@main::listeners) {
$_->close_server;
}
unless ($^O =~ /^MS/) {
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
alarm(0);
}
exec "$line" or dbg('cron', "exec '$line' failed $!");
}
dbg('connect', "program $sort $line started");
$conn->{pid} = $pid;
$conn->{sort} = $sort;
$conn->{lineend} = "\cM" if $sort eq 'ax25';
} else {
dbg('connect', "can't $sort fork for $line $!");
}
} else {
dbg('err', "invalid type of connection ($sort)");
$conn->disconnect;

3
perl/Msg.pm
View File

@ -167,8 +167,6 @@ sub disconnect {
$call ||= 'unallocated';
dbg('connll', "Connection $call disconnected");
set_event_handler ($sock, read => undef, write => undef, error => undef);
unless ($^O =~ /^MS/i) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
}
@ -181,6 +179,7 @@ sub disconnect {
}
return unless defined($sock);
set_event_handler ($sock, read => undef, write => undef, error => undef);
shutdown($sock, 3);
close($sock);
}