X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=b7b2d4bb84ec21ae1d76c5a3bd2f9ba89993fc97;hb=4a8336156c820698be4933a3e36513750709926d;hp=2758e64dd3a1f8c54fd65998fbee065ee2f6a51a;hpb=3761cb3e0997a63ca4611f0c684474dd9bc80c9a;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 2758e64d..b7b2d4bb 100644 --- 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. # -# The instance variable in the outside world will be generally be called $dxchann +# 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' @@ -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 -# 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$ # @@ -28,11 +28,12 @@ package DXChannel; use Msg; use DXM; use DXUtil; +use DXVars; use DXDebug; use Filter; use strict; -use vars qw(%channels %valid); +use vars qw(%channels %valid @ISA); %channels = (); @@ -74,11 +75,11 @@ use vars qw(%channels %valid); 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', @@ -86,6 +87,9 @@ use vars qw(%channels %valid); 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', ); # object destruction @@ -100,11 +104,12 @@ sub DESTROY 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)] @@ -130,12 +135,6 @@ sub alloc $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; } @@ -157,12 +156,11 @@ sub get_all # # 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; @@ -171,10 +169,9 @@ sub get_all_ak1a # 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; @@ -183,11 +180,10 @@ sub get_all_users # 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; } @@ -285,7 +281,7 @@ sub send_now my $call = $self->{call}; for (@_) { - chomp; +# chomp; my @lines = split /\n/; for (@lines) { $conn->send_now("$sort$call|$_"); @@ -306,7 +302,7 @@ sub send # this is always later and always data my $call = $self->{call}; for (@_) { - chomp; +# chomp; my @lines = split /\n/; for (@lines) { $conn->send_later("D$call|$_"); @@ -361,7 +357,7 @@ sub state 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}; } @@ -446,12 +442,16 @@ sub decode_input 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('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); } @@ -465,8 +465,13 @@ sub AUTOLOAD $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__;