X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=3637b7626885a6ec63e20720c8b3008ba03ba270;hb=502f900651a46b96008028945616a3b610d6cc7a;hp=9f7b8d180fefec8ce6f9184b0bbc122b5fc9bbc6;hpb=f534cd884051603e9f0368b912afa355e7a2310f;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 9f7b8d18..3637b762 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,16 +73,19 @@ 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 => '9,Ping Interval ',
-		  nopings => '9,Ping Obs Count',
-		  lastping => '9,Ping last sent,atime',
-		  pingtime => '9,Ping totaltime,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
@@ -119,6 +122,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;
@@ -129,6 +133,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; 
@@ -149,6 +154,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
 {
@@ -177,7 +220,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;
@@ -191,13 +239,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
 {
@@ -308,8 +377,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();
@@ -331,6 +399,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
 
 #