projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disconnect channels whose route node has disappeared
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index 2758e64dd3a1f8c54fd65998fbee065ee2f6a51a..f1e711e07d75cc3d1431818d0532f4bbbbbe9579 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-4,7
+4,7
@@
# This is the base class for all channel operations, which is everything to do
# with input and output really.
#
# This is the base class for all channel operations, which is everything to do
# with input and output really.
#
-# The instance variable in the outside world will be generally be called $dxchan
n
+# The instance variable in the outside world will be generally be called $dxchan
#
# This class is 'inherited' (if that is the goobledegook for what I am doing)
# by various other modules. The point to understand is that the 'instance variable'
#
# This class is 'inherited' (if that is the goobledegook for what I am doing)
# by various other modules. The point to understand is that the 'instance variable'
@@
-17,9
+17,9
@@
#
# PLEASE NOTE - I am a C programmer using this as a method of learning perl
# firstly and OO about ninthly (if you don't like the design and you can't
#
# PLEASE NOTE - I am a C programmer using this as a method of learning perl
# firstly and OO about ninthly (if you don't like the design and you can't
-# improve it with better OO
by
make it smaller and more efficient, then tough).
+# improve it with better OO
and thus
make it smaller and more efficient, then tough).
#
#
-# Copyright (c) 1998 - Dirk Koopman G1TLH
+# Copyright (c) 1998
-2000
- Dirk Koopman G1TLH
#
# $Id$
#
#
# $Id$
#
@@
-28,13
+28,16
@@
package DXChannel;
use Msg;
use DXM;
use DXUtil;
use Msg;
use DXM;
use DXUtil;
+use DXVars;
use DXDebug;
use Filter;
use DXDebug;
use Filter;
+use Prefix;
use strict;
use strict;
-use vars qw(%channels %valid);
+use vars qw(%channels %valid
@ISA $count
);
%channels = ();
%channels = ();
+$count = 0;
%valid = (
call => '0,Callsign',
%valid = (
call => '0,Callsign',
@@
-56,7
+59,7
@@
use vars qw(%channels %valid);
talk => '0,Want Talk,yesno',
ann => '0,Want Announce,yesno',
here => '0,Here?,yesno',
talk => '0,Want Talk,yesno',
ann => '0,Want Announce,yesno',
here => '0,Here?,yesno',
- conf
mode
=> '0,In Conference?,yesno',
+ conf => '0,In Conference?,yesno',
dx => '0,DX Spots,yesno',
redirect => '0,Redirect messages to',
lang => '0,Language',
dx => '0,DX Spots,yesno',
redirect => '0,Redirect messages to',
lang => '0,Language',
@@
-74,11
+77,13
@@
use vars qw(%channels %valid);
annfilter => '5,Announce Filter',
wwvfilter => '5,WWV Filter',
wcyfilter => '5,WCY Filter',
annfilter => '5,Announce Filter',
wwvfilter => '5,WWV Filter',
wcyfilter => '5,WCY Filter',
- spotfilter => '5,Spot Filter',
+ spotsfilter => '5,Spot Filter',
+ routefilter => '5,route Filter',
inannfilter => '5,Input Ann Filter',
inwwvfilter => '5,Input WWV Filter',
inwcyfilter => '5,Input WCY Filter',
inannfilter => '5,Input Ann Filter',
inwwvfilter => '5,Input WWV Filter',
inwcyfilter => '5,Input WCY Filter',
- inspotfilter => '5,Input Spot Filter',
+ inspotsfilter => '5,Input Spot Filter',
+ inroutefilter => '5,Input Route Filter',
passwd => '9,Passwd List,parray',
pingint => '5,Ping Interval ',
nopings => '5,Ping Obs Count',
passwd => '9,Passwd List,parray',
pingint => '5,Ping Interval ',
nopings => '5,Ping Obs Count',
@@
-86,25
+91,27
@@
use vars qw(%channels %valid);
pingtime => '5,Ping totaltime,parray',
pingave => '0,Ping ave time',
logininfo => '9,Login info req,yesno',
pingtime => '5,Ping totaltime,parray',
pingave => '0,Ping ave time',
logininfo => '9,Login info req,yesno',
+ talklist => '0,Talk List,parray',
+ cluster => '5,Cluster data',
+ isbasic => '9,Internal Connection',
+ errors => '9,Errors',
+ route => '9,Route Data',
+ dxcc => '0,Country Code',
+ itu => '0,ITU Zone',
+ cq => '0,CQ Zone',
);
# object destruction
sub DESTROY
{
my $self = shift;
);
# object destruction
sub DESTROY
{
my $self = shift;
- undef $self->{user};
- undef $self->{conn};
- undef $self->{loc};
- undef $self->{pagedata};
- undef $self->{group};
- undef $self->{delayed};
- undef $self->{annfilter};
- undef $self->{wwvfilter};
- undef $self->{spotfilter};
- undef $self->{inannfilter};
- undef $self->{inwwvfilter};
- undef $self->{inspotfilter};
- undef $self->{passwd};
+ for (keys %$self) {
+ if (ref($self->{$_})) {
+ delete $self->{$_};
+ }
+ }
+ dbg("DXChannel $self->{call} destroyed ($count)") if isdbg('chan');
+ $count--;
}
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
}
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@
-130,12
+137,16
@@
sub alloc
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
- # get the filters
- $self->{spotfilter} = Filter::read_in('spots', $call, 0);
- $self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
- $self->{wcyfilter} = Filter::read_in('wcy', $call, 0);
- $self->{annfilter} = Filter::read_in('ann', $call, 0);
+ # add in all the dxcc, itu, zone info
+ my @dxcc = Prefix::extract($call);
+ if (@dxcc > 0) {
+ $self->{dxcc} = $dxcc[1]->dxcc;
+ $self->{itu} = $dxcc[1]->itu;
+ $self->{cq} = $dxcc[1]->cq;
+ }
+ $count++;
+ dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
bless $self, $pkg;
return $channels{$call} = $self;
}
bless $self, $pkg;
return $channels{$call} = $self;
}
@@
-157,12
+168,11
@@
sub get_all
#
# gimme all the ak1a nodes
#
#
# gimme all the ak1a nodes
#
-sub get_all_
ak1a
+sub get_all_
nodes
{
{
- my @list = DXChannel->get_all();
my $ref;
my @out;
my $ref;
my @out;
- foreach $ref (
@list
) {
+ foreach $ref (
values %channels
) {
push @out, $ref if $ref->is_node;
}
return @out;
push @out, $ref if $ref->is_node;
}
return @out;
@@
-171,10
+181,9
@@
sub get_all_ak1a
# return a list of all users
sub get_all_users
{
# return a list of all users
sub get_all_users
{
- my @list = DXChannel->get_all();
my $ref;
my @out;
my $ref;
my @out;
- foreach $ref (
@list
) {
+ foreach $ref (
values %channels
) {
push @out, $ref if $ref->is_user;
}
return @out;
push @out, $ref if $ref->is_user;
}
return @out;
@@
-183,11
+192,10
@@
sub get_all_users
# return a list of all user callsigns
sub get_all_user_calls
{
# return a list of all user callsigns
sub get_all_user_calls
{
- my @list = DXChannel->get_all();
my $ref;
my @out;
my $ref;
my @out;
- foreach $ref (
@list
) {
- push @out, $ref->
call
if $ref->is_user;
+ foreach $ref (
values %channels
) {
+ push @out, $ref->
{call}
if $ref->is_user;
}
return @out;
}
}
return @out;
}
@@
-285,11
+293,11
@@
sub send_now
my $call = $self->{call};
for (@_) {
my $call = $self->{call};
for (@_) {
-
chomp;
+
#
chomp;
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
- dbg(
'chan', "-> $sort $call $_"
);
+ dbg(
"-> $sort $call $_") if isdbg('chan'
);
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-306,11
+314,11
@@
sub send # this is always later and always data
my $call = $self->{call};
for (@_) {
my $call = $self->{call};
for (@_) {
-
chomp;
+
#
chomp;
my @lines = split /\n/;
for (@lines) {
$conn->send_later("D$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_later("D$call|$_");
- dbg(
'chan', "-> D $call $_"
);
+ dbg(
"-> D $call $_") if isdbg('chan'
);
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-358,10
+366,10
@@
sub state
$self->{oldstate} = $self->{state};
$self->{state} = shift;
$self->{func} = '' unless defined $self->{func};
$self->{oldstate} = $self->{state};
$self->{state} = shift;
$self->{func} = '' unless defined $self->{func};
- dbg(
'state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n"
);
+ dbg(
"$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n") if isdbg('state'
);
# if there is any queued up broadcasts then splurge them out here
# if there is any queued up broadcasts then splurge them out here
- if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq '
convers
')) {
+ if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq '
talk
')) {
$self->send (@{$self->{delayed}});
delete $self->{delayed};
}
$self->send (@{$self->{delayed}});
delete $self->{delayed};
}
@@
-374,12
+382,9
@@
sub disconnect
{
my $self = shift;
my $user = $self->{user};
{
my $self = shift;
my $user = $self->{user};
- my $conn = $self->{conn};
- my $call = $self->{call};
- $self->finish($conn);
$user->close() if defined $user;
$user->close() if defined $user;
- $
conn->disconnect() if $conn
;
+ $
self->{conn}->disconnect
;
$self->del();
}
$self->del();
}
@@
-446,12
+451,16
@@
sub decode_input
my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
# the above regexp must work
my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
# the above regexp must work
- if (!defined $sort || !defined $call || !defined $line ||
- (ref $dxchan && $call ne $chcall)) {
- $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- dbg('chan', "DUFF Line from $chcall: $data");
+ unless (defined $sort && defined $call && defined $line) {
+# $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ dbg("DUFF Line on $chcall: $data") if isdbg('err');
return ();
}
return ();
}
+
+ if(ref($dxchan) && $call ne $chcall) {
+ dbg("DUFF Line come in for $call on wrong channel $chcall") if isdbg('err');
+ return();
+ }
return ($sort, $call, $line);
}
return ($sort, $call, $line);
}
@@
-465,8
+474,13
@@
sub AUTOLOAD
$name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
$name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
- @_ ? $self->{$name} = shift : $self->{$name} ;
+
+ # this clever line of code creates a subroutine which takes over from autoload
+ # from OO Perl - Conway
+ *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+ @_ ? $self->{$name} = shift : $self->{$name} ;
}
}
+
1;
__END__;
1;
__END__;