X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=b7d32c44ad4f22e6a98693f7e531d373b61835fb;hb=e69b2b430d27710d1bb636f9aa7720da1d067359;hp=3ccadeaf426e0864d355a76d095faa36d8ad54f8;hpb=82de56e409a19a05761794c9588713160b51144e;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 3ccadeaf..b7d32c44 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -30,7 +30,6 @@ use DXM; use DXUtil; use DXDebug; use Filter; -use Carp; use strict; use vars qw(%channels %valid); @@ -52,6 +51,7 @@ 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', @@ -73,11 +73,20 @@ use vars qw(%channels %valid); delayed => '5,Delayed messages,parray', annfilter => '5,Announce Filter', wwvfilter => '5,WWV Filter', + wcyfilter => '5,WCY Filter', spotfilter => '5,Spot Filter', inannfilter => '5,Input Ann Filter', inwwvfilter => '5,Input WWV Filter', + inwcyfilter => '5,Input WCY Filter', inspotfilter => '5,Input Spot Filter', passwd => '9,Passwd List,parray', + 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', ); # object destruction @@ -114,6 +123,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; @@ -124,6 +134,7 @@ sub alloc # 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; @@ -144,6 +155,44 @@ sub get_all return values(%channels); } +# +# gimme all the ak1a nodes +# +sub get_all_ak1a +{ + my @list = DXChannel->get_all(); + my $ref; + my @out; + foreach $ref (@list) { + 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) { + 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; + } + return @out; +} + # obtain a channel object by searching for its connection reference sub get_by_cnum { @@ -165,7 +214,19 @@ sub del delete $channels{$self->{call}}; } -# is it an ak1a cluster ? +# is it a bbs +sub is_bbs +{ + my $self = shift; + return $self->{'sort'} eq 'B'; +} + +sub is_node +{ + my $self = shift; + return $self->{'sort'} =~ /[ACRSX]/; +} +# is it an ak1a node ? sub is_ak1a { my $self = shift; @@ -179,26 +240,58 @@ 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 +{ + my $self = shift; + return @_ ? $self->{'sort'} = shift : $self->{'sort'} ; +} + # handle out going messages, immediately without waiting for the select to drop # this could, in theory, block sub send_now { my $self = shift; my $conn = $self->{conn}; + return unless $conn; my $sort = shift; my $call = $self->{call}; for (@_) { - chomp; - $conn->send_now("$sort$call|$_") if $conn; - dbg('chan', "-> $sort $call $_") if $conn; +# chomp; + my @lines = split /\n/; + for (@lines) { + $conn->send_now("$sort$call|$_"); + dbg('chan', "-> $sort $call $_"); + } } $self->{t} = time; } @@ -210,12 +303,16 @@ sub send # this is always later and always data { my $self = shift; my $conn = $self->{conn}; + return unless $conn; my $call = $self->{call}; for (@_) { - chomp; - $conn->send_later("D$call|$_") if $conn; - dbg('chan', "-> D $call $_") if $conn; +# chomp; + my @lines = split /\n/; + for (@lines) { + $conn->send_later("D$call|$_"); + dbg('chan', "-> D $call $_"); + } } $self->{t} = time; } @@ -265,7 +362,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}; } @@ -281,8 +378,7 @@ sub disconnect my $conn = $self->{conn}; my $call = $self->{call}; - $self->finish(); - $conn->send_now("Z$call|bye") if $conn; # this will cause 'client' to disconnect + $self->finish($conn); $user->close() if defined $user; $conn->disconnect() if $conn; $self->del(); @@ -304,6 +400,22 @@ 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; + $dxchan->send($dxchan->msg($m, $self->{call})) if $dxchan->{logininfo}; + } +} + # various access routines # @@ -325,6 +437,26 @@ 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 + 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"); + return (); + } + + return ($sort, $call, $line); +} + no strict; sub AUTOLOAD {