projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Steve has fixed Sun.pm
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index f577ded847405cbcfbac279f4f2b0ab7327ee828..4ded62674e5a1c263fe2eda3c5569b4ee0be0b3b 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-29,6
+29,7
@@
use Msg;
use DXM;
use DXUtil;
use DXDebug;
use DXM;
use DXUtil;
use DXDebug;
+use Filter;
use Carp;
use strict;
use Carp;
use strict;
@@
-73,7
+74,16
@@
use vars qw(%channels %valid);
annfilter => '5,Announce Filter',
wwvfilter => '5,WWV Filter',
spotfilter => '5,Spot Filter',
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',
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
);
# object destruction
@@
-89,6
+99,9
@@
sub DESTROY
undef $self->{annfilter};
undef $self->{wwvfilter};
undef $self->{spotfilter};
undef $self->{annfilter};
undef $self->{wwvfilter};
undef $self->{spotfilter};
+ undef $self->{inannfilter};
+ undef $self->{inwwvfilter};
+ undef $self->{inspotfilter};
undef $self->{passwd};
}
undef $self->{passwd};
}
@@
-113,6
+126,12
@@
sub alloc
$self->{oldstate} = 0;
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
$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;
}
bless $self, $pkg;
return $channels{$call} = $self;
}
@@
-131,6
+150,44
@@
sub get_all
return values(%channels);
}
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
{
# obtain a channel object by searching for its connection reference
sub get_by_cnum
{
@@
-152,6
+209,13
@@
sub del
delete $channels{$self->{call}};
}
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
{
# is it an ak1a cluster ?
sub is_ak1a
{
@@
-173,19
+237,30
@@
sub is_connect
return $self->{'sort'} eq 'C';
}
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};
# 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;
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;
}
}
$self->{t} = time;
}
@@
-197,12
+272,16
@@
sub send # this is always later and always data
{
my $self = shift;
my $conn = $self->{conn};
{
my $self = shift;
my $conn = $self->{conn};
+ return unless $conn;
my $call = $self->{call};
for (@_) {
chomp;
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;
}
}
$self->{t} = time;
}
@@
-267,8
+346,9
@@
sub disconnect
my $user = $self->{user};
my $conn = $self->{conn};
my $call = $self->{call};
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;
$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
#
# various access routines
#