X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=ba2e0edcad28607cb0df2502567817c95909e444;hb=765add8acca099e69f2b2cde2bb58a48a00852d3;hp=dce4fb5002bb1d277b76527e9e3e81749565cf1a;hpb=f7dd82f2355fd2bf0a342838e3a78eda8c7c623d;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index dce4fb50..ba2e0edc 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,14 +28,16 @@ package DXChannel; use Msg; use DXM; use DXUtil; +use DXVars; use DXDebug; use Filter; -use Carp; +use Prefix; use strict; -use vars qw(%channels %valid); +use vars qw(%channels %valid @ISA $count); %channels = (); +$count = 0; %valid = ( call => '0,Callsign', @@ -52,11 +54,12 @@ use vars qw(%channels %valid); consort => '5,Connection Type', 'sort' => '5,Type of Channel', wwv => '0,Want WWV,yesno', + wcy => '0,Want WCY,yesno', wx => '0,Want WX,yesno', talk => '0,Want Talk,yesno', ann => '0,Want Announce,yesno', here => '0,Here?,yesno', - confmode => '0,In Conference?,yesno', + conf => '0,In Conference?,yesno', dx => '0,DX Spots,yesno', redirect => '0,Redirect messages to', lang => '0,Language', @@ -71,38 +74,54 @@ use vars qw(%channels %valid); group => '0,Access Group,parray', # used to create a group of users/nodes for some purpose or other isolate => '5,Isolate network,yesno', delayed => '5,Delayed messages,parray', - annfilter => '5,Announce Filter', - wwvfilter => '5,WWV Filter', - spotfilter => '5,Spot Filter', - inannfilter => '5,Input Ann Filter', - inwwvfilter => '5,Input WWV Filter', - inspotfilter => '5,Input Spot Filter', + annfilter => '5,Ann Filt-out', + wwvfilter => '5,WWV Filt-out', + wcyfilter => '5,WCY Filt-out', + spotsfilter => '5,Spot Filt-out', + routefilter => '5,Route Filt-out', + inannfilter => '5,Ann Filt-inp', + inwwvfilter => '5,WWV Filt-inp', + inwcyfilter => '5,WCY Filt-inp', + inspotsfilter => '5,Spot Filt-inp', + inroutefilter => '5,Route Filt-inp', passwd => '9,Passwd List,parray', - pingint => '9,Ping Interval ', - nopings => '9,Ping Obs Count', - lastping => '9,Ping last sent,atime', - pingrec => '9,Pings no rec', - pingtime => '9,Ping totaltime', + pingint => '5,Ping Interval ', + nopings => '5,Ping Obs Count', + lastping => '5,Ping last sent,atime', + 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', + enhanced => '5,Enhanced Client,yesno', + senddbg => '8,Sending Debug,yesno', + width => '0,Column Width', + disconnecting => '9,Disconnecting,yesno', ); +use vars qw($VERSION $BRANCH); +$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$main::build += $VERSION; +$main::branch += $BRANCH; + # 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)] @@ -120,6 +139,7 @@ sub alloc $self->{lang} = $user->lang; $user->new_group() if !$user->group; $self->{group} = $user->group; + $self->{sort} = $user->sort; } $self->{startt} = $self->{t} = time; $self->{state} = 0; @@ -127,11 +147,16 @@ 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->{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; } @@ -150,6 +175,41 @@ sub get_all return values(%channels); } +# +# gimme all the ak1a nodes +# +sub get_all_nodes +{ + my $ref; + my @out; + foreach $ref (values %channels) { + push @out, $ref if $ref->is_node; + } + return @out; +} + +# return a list of all users +sub get_all_users +{ + my $ref; + my @out; + 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 $ref; + my @out; + foreach $ref (values %channels) { + push @out, $ref->{call} if $ref->is_user; + } + return @out; +} + # obtain a channel object by searching for its connection reference sub get_by_cnum { @@ -178,7 +238,12 @@ sub is_bbs return $self->{'sort'} eq 'B'; } -# is it an ak1a cluster ? +sub is_node +{ + my $self = shift; + return $self->{'sort'} =~ /[ACRSX]/; +} +# is it an ak1a node ? sub is_ak1a { my $self = shift; @@ -192,13 +257,34 @@ sub is_user return $self->{'sort'} eq 'U'; } -# is it a connect type -sub is_connect +# is it a clx node +sub is_clx { my $self = shift; return $self->{'sort'} eq 'C'; } +# is it a spider node +sub is_spider +{ + my $self = shift; + return $self->{'sort'} eq 'S'; +} + +# is it a DXNet node +sub is_dxnet +{ + my $self = shift; + return $self->{'sort'} eq 'X'; +} + +# is it a ar-cluster node +sub is_arcluster +{ + my $self = shift; + return $self->{'sort'} eq 'R'; +} + # for perl 5.004's benefit sub sort { @@ -217,11 +303,34 @@ sub send_now my $call = $self->{call}; for (@_) { - chomp; +# chomp; my @lines = split /\n/; for (@lines) { $conn->send_now("$sort$call|$_"); - dbg('chan', "-> $sort $call $_"); + dbg("-> $sort $call $_") if isdbg('chan'); + } + } + $self->{t} = time; +} + +# +# send later with letter (more control) +# + +sub send_later +{ + my $self = shift; + my $conn = $self->{conn}; + return unless $conn; + my $sort = shift; + my $call = $self->{call}; + + for (@_) { +# chomp; + my @lines = split /\n/; + for (@lines) { + $conn->send_later("$sort$call|$_"); + dbg("-> $sort $call $_") if isdbg('chan'); } } $self->{t} = time; @@ -238,11 +347,11 @@ 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|$_"); - dbg('chan', "-> D $call $_"); + dbg("-> D $call $_") if isdbg('chan'); } } $self->{t} = time; @@ -290,10 +399,10 @@ sub state $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 ($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}; } @@ -306,13 +415,9 @@ sub disconnect { my $self = shift; my $user = $self->{user}; - my $conn = $self->{conn}; - my $call = $self->{call}; - $self->finish(); - $conn->send_now("Z$call|bye") if $conn; # this will cause 'client' to disconnect $user->close() if defined $user; - $conn->disconnect() if $conn; + $self->{conn}->disconnect; $self->del(); } @@ -332,6 +437,23 @@ sub closeall } } +# +# Tell all the users that we have come in or out (if they want to know) +# +sub tell_login +{ + my ($self, $m) = @_; + + # send info to all logged in thingies + my @dxchan = get_all_users(); + my $dxchan; + foreach $dxchan (@dxchan) { + next if $dxchan == $self; + next if $dxchan->{call} eq $main::mycall; + $dxchan->send($dxchan->msg($m, $self->{call})) if $dxchan->{logininfo}; + } +} + # various access routines # @@ -353,6 +475,30 @@ sub field_prompt return $valid{$ele}; } +# take a standard input message and decode it into its standard parts +sub decode_input +{ + my $dxchan = shift; + my $data = shift; + 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 + 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 (); + } + + 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); +} + no strict; sub AUTOLOAD { @@ -362,8 +508,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__;