X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=4ded62674e5a1c263fe2eda3c5569b4ee0be0b3b;hb=b0dc102f62871b43134807fa254749b1720d326a;hp=6495e7a7edde6ed7e9ff32ac5630e755d9053816;hpb=3eb9538d135d9ff21d8ce7c0e0c6b3e6d7fb59a9;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 6495e7a7..4ded6267 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -29,6 +29,7 @@ use Msg; use DXM; use DXUtil; use DXDebug; +use Filter; use Carp; use strict; @@ -42,14 +43,14 @@ use vars qw(%channels %valid); user => '9,DXUser ref', startt => '0,Start Time,atime', t => '9,Time,atime', - pc50_t => '9,Last PC50 Time,atime', + pc50_t => '5,Last PC50 Time,atime', priv => '9,Privilege', state => '0,Current State', oldstate => '5,Last State', list => '9,Dep Chan List', name => '0,User Name', - consort => '9,Connection Type', - 'sort' => '9,Type of Channel', + consort => '5,Connection Type', + 'sort' => '5,Type of Channel', wwv => '0,Want WWV,yesno', wx => '0,Want WX,yesno', talk => '0,Want Talk,yesno', @@ -59,21 +60,30 @@ use vars qw(%channels %valid); dx => '0,DX Spots,yesno', redirect => '0,Redirect messages to', lang => '0,Language', - func => '9,Function', + func => '5,Function', loc => '9,Local Vars', # used by func to store local variables in beep => '0,Want Beeps,yesno', - lastread => '9,Last Msg Read', - outbound => '9,outbound?,yesno', + lastread => '5,Last Msg Read', + outbound => '5,outbound?,yesno', remotecmd => '9,doing rcmd,yesno', pagelth => '0,Page Length', pagedata => '9,Page Data Store', group => '0,Access Group,parray', # used to create a group of users/nodes for some purpose or other - isolate => '9,Isolate network,yesno', - delayed => '9,Delayed messages,parray', - annfilter => '9,Announce Filter', - wwvfilter => '9,WWV Filter', - spotfilter => '9,Spot Filter', + 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', 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', ); # object destruction @@ -89,6 +99,9 @@ sub DESTROY undef $self->{annfilter}; undef $self->{wwvfilter}; undef $self->{spotfilter}; + undef $self->{inannfilter}; + undef $self->{inwwvfilter}; + undef $self->{inspotfilter}; undef $self->{passwd}; } @@ -113,6 +126,12 @@ sub alloc $self->{oldstate} = 0; $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); + bless $self, $pkg; return $channels{$call} = $self; } @@ -131,6 +150,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_ak1a; + } + 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 { @@ -152,6 +209,13 @@ sub del delete $channels{$self->{call}}; } +# is it a bbs +sub is_bbs +{ + my $self = shift; + return $self->{'sort'} eq 'B'; +} + # is it an ak1a cluster ? sub is_ak1a { @@ -173,19 +237,30 @@ sub is_connect return $self->{'sort'} eq 'C'; } +# 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; + my @lines = split /\n/; + for (@lines) { + $conn->send_now("$sort$call|$_"); + dbg('chan', "-> $sort $call $_"); + } } $self->{t} = time; } @@ -197,12 +272,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; + my @lines = split /\n/; + for (@lines) { + $conn->send_later("D$call|$_"); + dbg('chan', "-> D $call $_"); + } } $self->{t} = time; } @@ -267,8 +346,9 @@ sub disconnect my $user = $self->{user}; my $conn = $self->{conn}; my $call = $self->{call}; + my $nopc39 = shift || 0; - $self->finish(); + $self->finish($nopc39); $conn->send_now("Z$call|bye") if $conn; # this will cause 'client' to disconnect $user->close() if defined $user; $conn->disconnect() if $conn; @@ -291,6 +371,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 #