#
# 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$
#
use Msg;
use DXM;
use DXUtil;
+use DXVars;
use DXDebug;
use Filter;
annfilter => '5,Announce Filter',
wwvfilter => '5,WWV Filter',
wcyfilter => '5,WCY Filter',
- spotfilter => '5,Spot Filter',
+ spotsfilter => '5,Spot 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',
passwd => '9,Passwd List,parray',
pingint => '5,Ping Interval ',
nopings => '5,Ping Obs Count',
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',
);
# object destruction
undef $self->{delayed};
undef $self->{annfilter};
undef $self->{wwvfilter};
- undef $self->{spotfilter};
+ undef $self->{spotsfilter};
undef $self->{inannfilter};
undef $self->{inwwvfilter};
- undef $self->{inspotfilter};
+ undef $self->{inspotsfilter};
undef $self->{passwd};
+ undef $self->{node};
}
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
$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);
-
bless $self, $pkg;
return $channels{$call} = $self;
}
#
# gimme all the ak1a nodes
#
-sub get_all_ak1a
+sub get_all_nodes
{
- my @list = DXChannel->get_all();
my $ref;
my @out;
- foreach $ref (@list) {
+ foreach $ref (values %channels) {
push @out, $ref if $ref->is_node;
}
return @out;
# return a list of all users
sub get_all_users
{
- my @list = DXChannel->get_all();
my $ref;
my @out;
- foreach $ref (@list) {
+ foreach $ref (values %channels) {
push @out, $ref if $ref->is_user;
}
return @out;
# return a list of all user callsigns
sub get_all_user_calls
{
- my @list = DXChannel->get_all();
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;
}
my $call = $self->{call};
for (@_) {
- chomp;
+# chomp;
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
my $call = $self->{call};
for (@_) {
- chomp;
+# chomp;
my @lines = split /\n/;
for (@lines) {
$conn->send_later("D$call|$_");
dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
# 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};
}
{
my $dxchan = shift;
my $data = shift;
- my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z1-9\-]{3,9})\|(.*)$/;
+ my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\-]{3,9})\|(.*)$/;
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)) {
+ unless (defined $sort && defined $call && defined $line) {
$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- dbg('chan', "DUFF Line from $chcall: $data");
+ dbg('err', "DUFF Line on $chcall: $data");
return ();
}
+
+ if(ref($dxchan) && $call ne $chcall) {
+ dbg('err', "DUFF Line come in for $call on wrong channel $chcall" );
+ return();
+ }
return ($sort, $call, $line);
}
$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__;